Mercurial > hg-stable
changeset 34066:6330df9d6393
simplemerge: remove unused `repo` parameter
This is now no longer used or needed thanks to the `decodeddata()` context
function.
Differential Revision: https://phab.mercurial-scm.org/D602
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Fri, 01 Sep 2017 10:35:43 -0700 |
| parents | 0e0ac8f09048 |
| children | b4226ad98366 |
| files | mercurial/filemerge.py mercurial/simplemerge.py |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Aug 29 18:24:51 2017 +0200 +++ b/mercurial/filemerge.py Fri Sep 01 10:35:43 2017 -0700 @@ -341,8 +341,7 @@ 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 @@ 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 @@ """ 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)
--- a/mercurial/simplemerge.py Tue Aug 29 18:24:51 2017 +0200 +++ b/mercurial/simplemerge.py Fri Sep 01 10:35:43 2017 -0700 @@ -413,7 +413,7 @@ 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`.