Mercurial > hg
changeset 45511:e29cd888fd17
rebase: delete unused p1 argument to _concludenode()
Unused since a0192a03216d (rebase: remove now unnecessary logic to
allow empty commit when branch changes, 2020-07-09).
Differential Revision: https://phab.mercurial-scm.org/D9055
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 18 Sep 2020 10:15:13 -0700 |
| parents | 1f5c548f15e5 |
| children | b4abfe142ff6 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Sep 18 10:04:02 2020 -0700 +++ b/hgext/rebase.py Fri Sep 18 10:15:13 2020 -0700 @@ -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: