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

merge: add stubs for preprocess and conclude steps of merge driver

Browse Source 
The exact semantics for what should happen (particularly with respect to error
handling) are still a bit hard to pin down, so I think it's better to
experiment with it as an extension for now. For now this stub will act as a
convenient point for extensions to hook on.
This commit is contained in:
Siddharth Agarwal 2015-10-15 01:17:29 -07:00
parent 3465e76062
commit 93aaae5f6a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/merge.py
View File

@ -516,6 +516,18 @@ def _checkcollision(repo, wmf, actions):
unfoldprefix = f + '/'
lastfull = f
def driverpreprocess(repo, ms, wctx, labels=None):
"""run the preprocess step of the merge driver, if any
This is currently not implemented -- it's an extension point."""
return True
def driverconclude(repo, ms, wctx, labels=None):
"""run the conclude step of the merge driver, if any
This is currently not implemented -- it's an extension point."""
return True
def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial,
acceptremote, followcopies):
"""