Mercurial > public > mercurial-scm > hg
diff mercurial/filemerge.py @ 34122:c0ce60459d84
merge: pass wctx to premerge, filemerge
In the in-memory merge branch. we'll need to call a function (``flushall``) on
the wctx inside of _xmerge.
This prepares the way so it can be done without hacks like ``fcd.ctx()``.
Differential Revision: https://phab.mercurial-scm.org/D449
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Mon, 11 Sep 2017 13:03:27 -0700 |
| parents | cd38b83bfb23 |
| children | 9c07cff039bc |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Sep 11 18:07:29 2017 +0200 +++ b/mercurial/filemerge.py Mon Sep 11 13:03:27 2017 -0700 @@ -626,7 +626,7 @@ return b, c -def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): +def _filemerge(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None): """perform a 3-way merge in the working directory premerge = whether this is a premerge @@ -750,11 +750,13 @@ def _workingpath(repo, ctx): return repo.wjoin(ctx.path()) -def premerge(repo, mynode, orig, fcd, fco, fca, labels=None): - return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels) +def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): + return _filemerge(True, repo, wctx, mynode, orig, fcd, fco, fca, + labels=labels) -def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): - return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels) +def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): + return _filemerge(False, repo, wctx, mynode, orig, fcd, fco, fca, + labels=labels) def loadinternalmerge(ui, extname, registrarobj): """Load internal merge tool from specified registrarobj