changeset 44178:bd4f666b55a7

merge: drop now-unused "abort" argument from hg.merge() Differential Revision: https://phab.mercurial-scm.org/D7997
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 16:07:42 -0800
parents 1850066f9e36
children 293cab97a766
files mercurial/commands.py mercurial/hg.py relnotes/next
diffstat 3 files changed, 5 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jan 24 17:49:21 2020 -0800
+++ b/mercurial/commands.py	Fri Jan 24 16:07:42 2020 -0800
@@ -4897,11 +4897,7 @@
         force = opts.get(b'force')
         labels = [b'working copy', b'merge rev']
         return hg.merge(
-            repo,
-            node,
-            force=force,
-            mergeforce=force,
-            labels=labels,
+            repo, node, force=force, mergeforce=force, labels=labels
         )
 
 
--- a/mercurial/hg.py	Fri Jan 24 17:49:21 2020 -0800
+++ b/mercurial/hg.py	Fri Jan 24 16:07:42 2020 -0800
@@ -1138,19 +1138,10 @@
 
 
 def merge(
-    repo,
-    node,
-    force=None,
-    remind=True,
-    mergeforce=False,
-    labels=None,
-    abort=False,
+    repo, node, force=None, remind=True, mergeforce=False, labels=None,
 ):
     """Branch merge with node, resolving changes. Return true if any
     unresolved conflicts."""
-    if abort:
-        return abortmerge(repo.ui, repo)
-
     stats = mergemod.update(
         repo,
         node,
--- a/relnotes/next	Fri Jan 24 17:49:21 2020 -0800
+++ b/relnotes/next	Fri Jan 24 16:07:42 2020 -0800
@@ -14,3 +14,6 @@
 
  * The deprecated `ui.progress()` has now been deleted. Please use
    `ui.makeprogress()` instead.
+
+ * `hg.merge()` has lost its `abort` argument. Please call
+   `hg.abortmerge()` directly instead.