D381: simplemerge: stop accepting, and passing, file parameters
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Thu Aug 17 18:40:32 UTC 2017
phillco updated this revision to Diff 1041.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D381?vs=862&id=1041
REVISION DETAIL
https://phab.mercurial-scm.org/D381
AFFECTED FILES
contrib/simplemerge
mercurial/filemerge.py
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -419,8 +419,8 @@
return [name_a, name_b, name_base]
-def simplemerge(ui, localfile, basefile, otherfile,
- localctx=None, basectx=None, otherctx=None, repo=None, **opts):
+def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None,
+ **opts):
"""Performs the simplemerge algorithm.
{local|base|other}ctx are optional. If passed, they (local/base/other) will
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -353,7 +353,7 @@
labels = _defaultconflictlabels
if len(labels) < 3:
labels.append('base')
- r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+ r = simplemerge.simplemerge(ui, fcd, fca, fco,
quiet=True, label=labels, repo=repo)
if not r:
ui.debug(" premerge successful\n")
@@ -384,7 +384,7 @@
ui = repo.ui
- r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+ r = simplemerge.simplemerge(ui, fcd, fca, fco,
label=labels, mode=mode, repo=repo)
return True, r, False
@@ -437,7 +437,7 @@
assert localorother is not None
tool, toolpath, binary, symlink = toolconf
a, b, c, back = files
- r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco,
+ r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
label=labels, localorother=localorother,
repo=repo)
return True, r
diff --git a/contrib/simplemerge b/contrib/simplemerge
--- a/contrib/simplemerge
+++ b/contrib/simplemerge
@@ -77,9 +77,6 @@
raise ParseError(_('wrong number of arguments'))
local, base, other = args
sys.exit(simplemerge.simplemerge(ui.ui.load(),
- local,
- base,
- other,
filebackedctx(local),
filebackedctx(base),
filebackedctx(other),
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list