Mercurial > hg-stable
changeset 44383:cd43cae79f25
rebase: remove some now-unused parent arguments
Differential Revision: https://phab.mercurial-scm.org/D7829
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 10 Jan 2020 17:20:12 -0800 |
| parents | 8082a77cc3a2 |
| children | e80da7a63264 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Jan 10 21:40:01 2020 -0800 +++ b/hgext/rebase.py Fri Jan 10 17:20:12 2020 -0800 @@ -506,7 +506,7 @@ p.complete() ui.note(_(b'rebase merging completed\n')) - def _concludenode(self, rev, p1, p2, editor, commitmsg=None): + def _concludenode(self, rev, p1, editor, commitmsg=None): '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev but also store useful information in extra. @@ -530,8 +530,6 @@ if self.inmemory: newnode = commitmemorynode( repo, - p1, - p2, wctx=self.wctx, extra=extra, commitmsg=commitmsg, @@ -543,8 +541,6 @@ else: newnode = commitnode( repo, - p1, - p2, extra=extra, commitmsg=commitmsg, editor=editor, @@ -640,7 +636,7 @@ editor = cmdutil.getcommiteditor( editform=editform, **pycompat.strkwargs(opts) ) - newnode = self._concludenode(rev, p1, p2, editor) + newnode = self._concludenode(rev, p1, editor) else: # Skip commit if we are collapsing newnode = None @@ -699,7 +695,7 @@ self.wctx.setparents(repo[p1].node(), repo[self.external].node()) newnode = self._concludenode( - revtoreuse, p1, self.external, editor, commitmsg=commitmsg + revtoreuse, p1, editor, commitmsg=commitmsg ) if newnode is not None: @@ -1421,7 +1417,7 @@ ) -def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg): +def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg): '''Commit the memory changes with parents p1 and p2. Return node of committed revision.''' # Replicates the empty check in ``repo.commit``. @@ -1447,7 +1443,7 @@ return commitres -def commitnode(repo, p1, p2, editor, extra, user, date, commitmsg): +def commitnode(repo, editor, extra, user, date, commitmsg): '''Commit the wd changes with parents p1 and p2. Return node of committed revision.''' dsguard = util.nullcontextmanager()