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: add a before-merge callback to internal merge tools

Browse Source 
We're going to separate the pre-merge and merge steps for merge tools. The
merge step will be specific to the tool, but the pre-merge step will be common
to all merge tools that need it.

However, some merge tools run checks *before* the pre-merge step. This callback
will allow that to continue to work.
This commit is contained in:
Siddharth Agarwal 2015-10-06 22:54:14 -07:00
parent 6e9048d788
commit 3226585b5b
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

@ -38,7 +38,7 @@ internals = {}
# Merge tools to document.
internalsdoc = {}
def internaltool(name, trymerge, onfailure=None):
def internaltool(name, trymerge, onfailure=None, precheck=None):
'''return a decorator for populating internal merge tool table'''
def decorator(func):
fullname = ':' + name
@ -48,6 +48,7 @@ def internaltool(name, trymerge, onfailure=None):
internalsdoc[fullname] = func
func.trymerge = trymerge
func.onfailure = onfailure
func.precheck = precheck
return func
return decorator