[PATCH 3 of 6 mergedriver] filemerge.filemerge: make a tuple containing merge paths on disk
Siddharth Agarwal
sid0 at fb.com
Thu Oct 8 02:33:14 CDT 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1444278116 25200
# Wed Oct 07 21:21:56 2015 -0700
# Node ID 98e1010a27cc61abe565362d6cca30f1fdc49053
# Parent 6b702d711892b207ee8478d3b382781782ef71d2
filemerge.filemerge: make a tuple containing merge paths on disk
We're going to need this same tuple elsewhere.
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -498,6 +498,7 @@ def filemerge(repo, mynode, orig, fcd, f
c = temp("other", fco)
back = a + ".orig"
util.copyfile(a, back)
+ files = (a, b, c, back)
if orig != fco.path():
ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
@@ -520,7 +521,7 @@ def filemerge(repo, mynode, orig, fcd, f
labels = _formatlabels(repo, fcd, fco, fca, labels)
needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
- (a, b, c, back), labels=labels)
+ files, labels=labels)
if not needcheck:
if r:
More information about the Mercurial-devel
mailing list