Patchwork D9055: rebase: delete unused p1 argument to _concludenode()

login
register
mail settings
Submitter phabricator
Date Sept. 18, 2020, 5:21 p.m.
Message ID <differential-rev-PHID-DREV-kqr626yajhcv5ubclprs-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47229/
State Superseded
Headers show

Comments

phabricator - Sept. 18, 2020, 5:21 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Unused since a0192a03216d <https://phab.mercurial-scm.org/rHGa0192a03216d6f0d279aa17312e946a06776875d> (rebase: remove now unnecessary logic to
  allow empty commit when branch changes, 2020-07-09).

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -517,7 +517,7 @@ 
         p.complete()
         ui.note(_(b'rebase merging completed\n'))
 
-    def _concludenode(self, rev, p1, editor, commitmsg=None):
+    def _concludenode(self, rev, editor, commitmsg=None):
         '''Commit the wd changes with parents p1 and p2.
 
         Reuse commit info from rev but also store useful information in extra.
@@ -643,7 +643,7 @@ 
                 # parents, and we don't want to create a merge commit here (unless
                 # we're rebasing a merge commit).
                 self.wctx.setparents(repo[p1].node(), repo[p2].node())
-                newnode = self._concludenode(rev, p1, editor)
+                newnode = self._concludenode(rev, editor)
             else:
                 # Skip commit if we are collapsing
                 newnode = None
@@ -710,7 +710,7 @@ 
 
             self.wctx.setparents(repo[p1].node(), repo[self.external].node())
             newnode = self._concludenode(
-                revtoreuse, p1, editor, commitmsg=commitmsg
+                revtoreuse, editor, commitmsg=commitmsg
             )
 
             if newnode is not None: