Show More
@@ -542,21 +542,20 b' class fold(histeditaction):' | |||
|
542 | 542 | middlecommits = newcommits.copy() |
|
543 | 543 | middlecommits.discard(ctx.node()) |
|
544 | 544 | |
|
545 | foldopts = {} | |
|
546 | if isinstance(self, rollup): | |
|
547 | foldopts['rollup'] = True | |
|
545 | return self.finishfold(repo.ui, repo, parentctx, rulectx, ctx.node(), | |
|
546 | middlecommits) | |
|
548 | 547 | |
|
549 | return self.finishfold(repo.ui, repo, parentctx, rulectx, ctx.node(), | |
|
550 | foldopts, middlecommits) | |
|
548 | def skipprompt(self): | |
|
549 | return False | |
|
551 | 550 | |
|
552 |
def finishfold(self, ui, repo, ctx, oldctx, newnode, |
|
|
551 | def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges): | |
|
553 | 552 | parent = ctx.parents()[0].node() |
|
554 | 553 | hg.update(repo, parent) |
|
555 | 554 | ### prepare new commit data |
|
556 |
commitopts = |
|
|
555 | commitopts = {} | |
|
557 | 556 | commitopts['user'] = ctx.user() |
|
558 | 557 | # commit message |
|
559 | if opts.get('rollup'): | |
|
558 | if self.skipprompt(): | |
|
560 | 559 | newmessage = ctx.description() |
|
561 | 560 | else: |
|
562 | 561 | newmessage = '\n***\n'.join( |
@@ -591,7 +590,8 b' class fold(histeditaction):' | |||
|
591 | 590 | return repo[n], replacements |
|
592 | 591 | |
|
593 | 592 | class rollup(fold): |
|
594 | pass | |
|
593 | def skipprompt(self): | |
|
594 | return True | |
|
595 | 595 | |
|
596 | 596 | class drop(histeditaction): |
|
597 | 597 | def run(self): |
General Comments 0
You need to be logged in to leave comments.
Login now