facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

simplemerge: remove unused repo parameter

Browse Source 
This is now no longer used or needed thanks to the `decodeddata()` context
function.

Differential Revision: https://phab.mercurial-scm.org/D602
This commit is contained in:
Phil Cohen 2017-09-01 10:35:43 -07:00
parent 87902af734
commit 5b0c47fbe3
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mercurial/filemerge.py
View File

@ -341,8 +341,7 @@ def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
labels = _defaultconflictlabels
if len(labels) < 3:
labels.append('base')
r = simplemerge.simplemerge(ui, fcd, fca, fco,
quiet=True, label=labels, repo=repo)
r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels)
if not r:
ui.debug(" premerge successful\n")
return 0
@ -371,8 +370,7 @@ def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
of merge, unless mode equals 'union' which suppresses the markers."""
ui = repo.ui
r = simplemerge.simplemerge(ui, fcd, fca, fco,
label=labels, mode=mode, repo=repo)
r = simplemerge.simplemerge(ui, fcd, fca, fco, label=labels, mode=mode)
return True, r, False
@internaltool('union', fullmerge,
@ -423,9 +421,8 @@ def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files,
"""
assert localorother is not None
tool, toolpath, binary, symlink = toolconf
r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
label=labels, localorother=localorother,
repo=repo)
r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels,
localorother=localorother)
return True, r
@internaltool('merge-local', mergeonly, precheck=_mergecheck)

2
mercurial/simplemerge.py
View File

@ -413,7 +413,7 @@ def _picklabels(defaults, overrides):
result[i] = override
return result
def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
def simplemerge(ui, localctx, basectx, otherctx, **opts):
"""Performs the simplemerge algorithm.
The merged result is written into `localctx`.