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: move 'merging' output to before file creation

Browse Source 
This has no visible impact but makes some future work simpler.
This commit is contained in:
Siddharth Agarwal 2015-10-07 22:58:52 -07:00
parent 7ea14fa915
commit 545f983ef8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mercurial/filemerge.py
View File

@ -493,13 +493,6 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
if mergetype == nomerge: if mergetype == nomerge:
return func(repo, mynode, orig, fcd, fco, fca, toolconf) return func(repo, mynode, orig, fcd, fco, fca, toolconf)
a = repo.wjoin(fd)
b = temp("base", fca)
c = temp("other", fco)
back = a + ".orig"
util.copyfile(a, back)
files = (a, b, c, back)
if orig != fco.path(): if orig != fco.path():
ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
else: else:
@ -507,6 +500,13 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
a = repo.wjoin(fd)
b = temp("base", fca)
c = temp("other", fco)
back = a + ".orig"
util.copyfile(a, back)
files = (a, b, c, back)
r = 0 r = 0
if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
toolconf): toolconf):