Mercurial > hg
comparison hgext/rebase.py @ 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 |
comparison
equal
deleted
inserted
replaced
45510:1f5c548f15e5 | 45511:e29cd888fd17 |
---|---|
515 for rev in sortedrevs: | 515 for rev in sortedrevs: |
516 self._rebasenode(tr, rev, allowdivergence, progress) | 516 self._rebasenode(tr, rev, allowdivergence, progress) |
517 p.complete() | 517 p.complete() |
518 ui.note(_(b'rebase merging completed\n')) | 518 ui.note(_(b'rebase merging completed\n')) |
519 | 519 |
520 def _concludenode(self, rev, p1, editor, commitmsg=None): | 520 def _concludenode(self, rev, editor, commitmsg=None): |
521 '''Commit the wd changes with parents p1 and p2. | 521 '''Commit the wd changes with parents p1 and p2. |
522 | 522 |
523 Reuse commit info from rev but also store useful information in extra. | 523 Reuse commit info from rev but also store useful information in extra. |
524 Return node of committed revision.''' | 524 Return node of committed revision.''' |
525 repo = self.repo | 525 repo = self.repo |
641 # a rebase started with an old hg version (before 9c9cfecd4600), | 641 # a rebase started with an old hg version (before 9c9cfecd4600), |
642 # because those old versions would have left us with two dirstate | 642 # because those old versions would have left us with two dirstate |
643 # parents, and we don't want to create a merge commit here (unless | 643 # parents, and we don't want to create a merge commit here (unless |
644 # we're rebasing a merge commit). | 644 # we're rebasing a merge commit). |
645 self.wctx.setparents(repo[p1].node(), repo[p2].node()) | 645 self.wctx.setparents(repo[p1].node(), repo[p2].node()) |
646 newnode = self._concludenode(rev, p1, editor) | 646 newnode = self._concludenode(rev, editor) |
647 else: | 647 else: |
648 # Skip commit if we are collapsing | 648 # Skip commit if we are collapsing |
649 newnode = None | 649 newnode = None |
650 # Update the state | 650 # Update the state |
651 if newnode is not None: | 651 if newnode is not None: |
708 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | 708 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) |
709 revtoreuse = max(self.state) | 709 revtoreuse = max(self.state) |
710 | 710 |
711 self.wctx.setparents(repo[p1].node(), repo[self.external].node()) | 711 self.wctx.setparents(repo[p1].node(), repo[self.external].node()) |
712 newnode = self._concludenode( | 712 newnode = self._concludenode( |
713 revtoreuse, p1, editor, commitmsg=commitmsg | 713 revtoreuse, editor, commitmsg=commitmsg |
714 ) | 714 ) |
715 | 715 |
716 if newnode is not None: | 716 if newnode is not None: |
717 newrev = repo[newnode].rev() | 717 newrev = repo[newnode].rev() |
718 for oldrev in self.state: | 718 for oldrev in self.state: |