Show More
@@ -506,7 +506,7 b' class rebaseruntime(object):' | |||||
506 | p.complete() |
|
506 | p.complete() | |
507 | ui.note(_(b'rebase merging completed\n')) |
|
507 | ui.note(_(b'rebase merging completed\n')) | |
508 |
|
508 | |||
509 |
def _concludenode(self, rev, p1, |
|
509 | def _concludenode(self, rev, p1, editor, commitmsg=None): | |
510 | '''Commit the wd changes with parents p1 and p2. |
|
510 | '''Commit the wd changes with parents p1 and p2. | |
511 |
|
511 | |||
512 | Reuse commit info from rev but also store useful information in extra. |
|
512 | Reuse commit info from rev but also store useful information in extra. | |
@@ -530,8 +530,6 b' class rebaseruntime(object):' | |||||
530 | if self.inmemory: |
|
530 | if self.inmemory: | |
531 | newnode = commitmemorynode( |
|
531 | newnode = commitmemorynode( | |
532 | repo, |
|
532 | repo, | |
533 | p1, |
|
|||
534 | p2, |
|
|||
535 | wctx=self.wctx, |
|
533 | wctx=self.wctx, | |
536 | extra=extra, |
|
534 | extra=extra, | |
537 | commitmsg=commitmsg, |
|
535 | commitmsg=commitmsg, | |
@@ -543,8 +541,6 b' class rebaseruntime(object):' | |||||
543 | else: |
|
541 | else: | |
544 | newnode = commitnode( |
|
542 | newnode = commitnode( | |
545 | repo, |
|
543 | repo, | |
546 | p1, |
|
|||
547 | p2, |
|
|||
548 | extra=extra, |
|
544 | extra=extra, | |
549 | commitmsg=commitmsg, |
|
545 | commitmsg=commitmsg, | |
550 | editor=editor, |
|
546 | editor=editor, | |
@@ -640,7 +636,7 b' class rebaseruntime(object):' | |||||
640 | editor = cmdutil.getcommiteditor( |
|
636 | editor = cmdutil.getcommiteditor( | |
641 | editform=editform, **pycompat.strkwargs(opts) |
|
637 | editform=editform, **pycompat.strkwargs(opts) | |
642 | ) |
|
638 | ) | |
643 |
newnode = self._concludenode(rev, p1, |
|
639 | newnode = self._concludenode(rev, p1, editor) | |
644 | else: |
|
640 | else: | |
645 | # Skip commit if we are collapsing |
|
641 | # Skip commit if we are collapsing | |
646 | newnode = None |
|
642 | newnode = None | |
@@ -699,7 +695,7 b' class rebaseruntime(object):' | |||||
699 |
|
695 | |||
700 | self.wctx.setparents(repo[p1].node(), repo[self.external].node()) |
|
696 | self.wctx.setparents(repo[p1].node(), repo[self.external].node()) | |
701 | newnode = self._concludenode( |
|
697 | newnode = self._concludenode( | |
702 |
revtoreuse, p1 |
|
698 | revtoreuse, p1, editor, commitmsg=commitmsg | |
703 | ) |
|
699 | ) | |
704 |
|
700 | |||
705 | if newnode is not None: |
|
701 | if newnode is not None: | |
@@ -1421,7 +1417,7 b' def externalparent(repo, state, destance' | |||||
1421 | ) |
|
1417 | ) | |
1422 |
|
1418 | |||
1423 |
|
1419 | |||
1424 |
def commitmemorynode(repo |
|
1420 | def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg): | |
1425 | '''Commit the memory changes with parents p1 and p2. |
|
1421 | '''Commit the memory changes with parents p1 and p2. | |
1426 | Return node of committed revision.''' |
|
1422 | Return node of committed revision.''' | |
1427 | # Replicates the empty check in ``repo.commit``. |
|
1423 | # Replicates the empty check in ``repo.commit``. | |
@@ -1447,7 +1443,7 b' def commitmemorynode(repo, p1, p2, wctx,' | |||||
1447 | return commitres |
|
1443 | return commitres | |
1448 |
|
1444 | |||
1449 |
|
1445 | |||
1450 |
def commitnode(repo |
|
1446 | def commitnode(repo, editor, extra, user, date, commitmsg): | |
1451 | '''Commit the wd changes with parents p1 and p2. |
|
1447 | '''Commit the wd changes with parents p1 and p2. | |
1452 | Return node of committed revision.''' |
|
1448 | Return node of committed revision.''' | |
1453 | dsguard = util.nullcontextmanager() |
|
1449 | dsguard = util.nullcontextmanager() |
General Comments 0
You need to be logged in to leave comments.
Login now