Show More
@@ -517,7 +517,7 b' class rebaseruntime(object):' | |||||
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, |
|
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. | |
@@ -643,7 +643,7 b' class rebaseruntime(object):' | |||||
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, |
|
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 | |
@@ -710,7 +710,7 b' class rebaseruntime(object):' | |||||
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 |
|
713 | revtoreuse, editor, commitmsg=commitmsg | |
714 | ) |
|
714 | ) | |
715 |
|
715 | |||
716 | if newnode is not None: |
|
716 | if newnode is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now