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: call precheck if available

Browse Source 
In upcoming patches we'll define a precheck function for some merge tools.
This commit is contained in:
Siddharth Agarwal 2015-10-06 22:55:21 -07:00
parent 3226585b5b
commit 11ffaa85a2
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mercurial/filemerge.py
View File

@ -467,10 +467,12 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
func = internals[tool]
trymerge = func.trymerge
onfailure = func.onfailure
precheck = func.precheck
else:
func = _xmerge
trymerge = True
onfailure = _("merging %s failed!\n")
precheck = None
toolconf = tool, toolpath, binary, symlink
@ -490,14 +492,22 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
markerstyle = ui.config('ui', 'mergemarkers', 'basic')
if not labels:
labels = _defaultconflictlabels
if markerstyle != 'basic':
labels = _formatlabels(repo, fcd, fco, fca, labels)
r = 0
if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
toolconf):
r = 1
needcheck = False
if not r: # precheck passed
markerstyle = ui.config('ui', 'mergemarkers', 'basic')
if not labels:
labels = _defaultconflictlabels
if markerstyle != 'basic':
labels = _formatlabels(repo, fcd, fco, fca, labels)
needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
(a, b, c, back), labels=labels)
needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf,
(a, b, c, back), labels=labels)
if not needcheck:
if r:
if onfailure: