Show More
@@ -459,7 +459,7 b' class rebaseruntime(object):' | |||
|
459 | 459 | overrides[('ui', 'allowemptycommit')] = True |
|
460 | 460 | with repo.ui.configoverride(overrides, 'rebase'): |
|
461 | 461 | if self.inmemory: |
|
462 |
newnode = co |
|
|
462 | newnode = commitmemorynode(repo, p1, p2, | |
|
463 | 463 | wctx=self.wctx, |
|
464 | 464 | extra=extra, |
|
465 | 465 | commitmsg=commitmsg, |
@@ -468,7 +468,7 b' class rebaseruntime(object):' | |||
|
468 | 468 | date=date) |
|
469 | 469 | mergemod.mergestate.clean(repo) |
|
470 | 470 | else: |
|
471 |
newnode = co |
|
|
471 | newnode = commitnode(repo, p1, p2, | |
|
472 | 472 | extra=extra, |
|
473 | 473 | commitmsg=commitmsg, |
|
474 | 474 | editor=editor, |
@@ -1032,8 +1032,7 b' def externalparent(repo, state, destance' | |||
|
1032 | 1032 | (max(destancestors), |
|
1033 | 1033 | ', '.join("%d" % p for p in sorted(parents)))) |
|
1034 | 1034 | |
|
1035 |
def co |
|
|
1036 | commitmsg): | |
|
1035 | def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg): | |
|
1037 | 1036 | '''Commit the memory changes with parents p1 and p2. |
|
1038 | 1037 | Return node of committed revision.''' |
|
1039 | 1038 | # Replicates the empty check in ``repo.commit``. |
@@ -1052,7 +1051,7 b' def concludememorynode(repo, p1, p2, wct' | |||
|
1052 | 1051 | wctx.clean() # Might be reused |
|
1053 | 1052 | return commitres |
|
1054 | 1053 | |
|
1055 |
def co |
|
|
1054 | def commitnode(repo, p1, p2, editor, extra, user, date, commitmsg): | |
|
1056 | 1055 | '''Commit the wd changes with parents p1 and p2. |
|
1057 | 1056 | Return node of committed revision.''' |
|
1058 | 1057 | dsguard = util.nullcontextmanager() |
General Comments 0
You need to be logged in to leave comments.
Login now