Mercurial > hg
changeset 26785:e9a0d5f5c225
merge: add stubs for preprocess and conclude steps of merge driver
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 15 Oct 2015 01:17:29 -0700 |
| parents | c0aab5961876 |
| children | 121f80d14e4b |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Oct 15 01:15:22 2015 -0700 +++ b/mercurial/merge.py Thu Oct 15 01:17:29 2015 -0700 @@ -516,6 +516,18 @@ 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): """