Patchwork D7997: merge: drop now-unused "abort" argument from hg.merge()

login
register
mail settings
Submitter phabricator
Date Jan. 26, 2020, 12:26 a.m.
Message ID <3c56eacc730067a797441bb5e8378a44@localhost.localdomain>
Download mbox | patch
Permalink /patch/44670/
State Not Applicable
Headers show

Comments

phabricator - Jan. 26, 2020, 12:26 a.m.
Closed by commit rHGbd4f666b55a7: merge: drop now-unused &quot;abort&quot; argument from hg.merge() (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7997?vs=19603&id=19616

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

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

AFFECTED FILES
  mercurial/commands.py
  mercurial/hg.py
  relnotes/next

CHANGE DETAILS




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

Patch

diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -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.
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -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,
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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
         )