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

filemerge.filemerge: make a tuple containing merge paths on disk

Browse Source 
We're going to need this same tuple elsewhere.
This commit is contained in:
Siddharth Agarwal 2015-10-07 21:21:56 -07:00
parent 6b1725d26f
commit 7ea14fa915
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/filemerge.py
View File

@ -498,6 +498,7 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
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, fco, fca, labels=None):
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: