Patchwork D6638: abort: removed labels argument from abortmerge()

login
register
mail settings
Submitter phabricator
Date July 15, 2019, 2:14 p.m.
Message ID <552fc62188c8c62f60160ec4d32d839f@localhost.localdomain>
Download mbox | patch
Permalink /patch/40928/
State Not Applicable
Headers show

Comments

phabricator - July 15, 2019, 2:14 p.m.
Closed by commit rHG8d03ee731751: abort: removed labels argument from abortmerge() (authored by taapas1128).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6638?vs=15889&id=15911

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6638/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6638

AFFECTED FILES
  mercurial/hg.py

CHANGE DETAILS




To: taapas1128, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel

Patch

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