D6638: abort: removed labels argument from abortmerge()
taapas1128 (Taapas Agrawal)
phabricator at mercurial-scm.org
Wed Jul 10 21:41:58 UTC 2019
taapas1128 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Labels are used to label the code that belongs to `working copy` and `merge rev`
in case of a conflicted state.
However when merge is aborted there is no unresolved merge in progress and hence
no labels are required.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6638
AFFECTED FILES
mercurial/hg.py
CHANGE DETAILS
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -957,7 +957,7 @@
"""Branch merge with node, resolving changes. Return true if any
unresolved conflicts."""
if abort:
- return abortmerge(repo.ui, repo, labels=labels)
+ return abortmerge(repo.ui, repo)
stats = mergemod.update(repo, node, branchmerge=True, force=force,
mergeforce=mergeforce, labels=labels)
@@ -969,7 +969,7 @@
repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats.unresolvedcount > 0
-def abortmerge(ui, repo, labels=None):
+def abortmerge(ui, repo):
ms = mergemod.mergestate.read(repo)
if ms.active():
# there were conflicts
@@ -980,8 +980,7 @@
repo.ui.status(_("aborting the merge, updating back to"
" %s\n") % node[:12])
- stats = mergemod.update(repo, node, branchmerge=False, force=True,
- labels=labels)
+ stats = mergemod.update(repo, node, branchmerge=False, force=True)
_showstats(repo, stats)
return stats.unresolvedcount > 0
To: taapas1128, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list