D682: merge: allow a custom working context to be passed to update
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Thu Sep 14 20:15:05 UTC 2017
phillco updated this revision to Diff 1831.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D682?vs=1726&id=1831
REVISION DETAIL
https://phab.mercurial-scm.org/D682
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1479,7 +1479,7 @@
def update(repo, node, branchmerge, force, ancestor=None,
mergeancestor=False, labels=None, matcher=None, mergeforce=False,
- updatecheck=None):
+ updatecheck=None, wc=None):
"""
Perform a merge between the working directory and the given node
@@ -1527,6 +1527,9 @@
2 = abort: uncommitted changes (commit or update --clean to discard changes)
3 = abort: uncommitted changes (checked in commands.py)
+ The merge is performed inside ``wc``, a workingctx-like objects. It defaults
+ to repo[None] if None is passed.
+
Return the same tuple as applyupdates().
"""
# Avoid cycle.
@@ -1550,7 +1553,8 @@
else:
partial = True
with repo.wlock():
- wc = repo[None]
+ if wc is None:
+ wc = repo[None]
pl = wc.parents()
p1 = pl[0]
pas = [None]
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list