# HG changeset patch
# User Taapas Agrawal <taapas2897@gmail.com>
# Date 2019-07-10 21:38:28
# Node ID 8d03ee7317515229e720fe634ca7a7695b24d546
# Parent  5a6ba316573673be536895e38fcd2edb89a5a6c6

abort: removed labels argument from abortmerge()

Labels are used to label the code that belongs to `working copy` and `merge rev`
in case of a conflicted state.
No such labelling is required while aborting merge as conflicted parts
are reverted to normal.

Differential Revision: https://phab.mercurial-scm.org/D6638

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -957,7 +957,7 @@ def merge(repo, node, force=None, remind
     """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 @@ def merge(repo, node, force=None, remind
         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 @@ def abortmerge(ui, repo, labels=None):
 
     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