Show More
@@ -499,10 +499,10 b' def rebase(ui, repo, **opts):' | |||||
499 |
|
499 | |||
500 | extrafn = _makeextrafn(rbsrt.extrafns) |
|
500 | extrafn = _makeextrafn(rbsrt.extrafns) | |
501 |
|
501 | |||
502 | sortedstate = sorted(rbsrt.state) |
|
502 | rbsrt.sortedstate = sorted(rbsrt.state) | |
503 | total = len(sortedstate) |
|
503 | total = len(rbsrt.sortedstate) | |
504 | pos = 0 |
|
504 | pos = 0 | |
505 | for rev in sortedstate: |
|
505 | for rev in rbsrt.sortedstate: | |
506 | ctx = repo[rev] |
|
506 | ctx = repo[rev] | |
507 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
507 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |
508 | ctx.description().split('\n', 1)[0]) |
|
508 | ctx.description().split('\n', 1)[0]) | |
@@ -599,7 +599,8 b' def rebase(ui, repo, **opts):' | |||||
599 | commitmsg += '\n* %s' % repo[rebased].description() |
|
599 | commitmsg += '\n* %s' % repo[rebased].description() | |
600 | editopt = True |
|
600 | editopt = True | |
601 | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) |
|
601 | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | |
602 | newnode = concludenode(repo, rev, p1, rbsrt.external, |
|
602 | revtoreuse = rbsrt.sortedstate[-1] | |
|
603 | newnode = concludenode(repo, revtoreuse, p1, rbsrt.external, | |||
603 | commitmsg=commitmsg, |
|
604 | commitmsg=commitmsg, | |
604 | extrafn=extrafn, editor=editor, |
|
605 | extrafn=extrafn, editor=editor, | |
605 | keepbranches=rbsrt.keepbranchesf, |
|
606 | keepbranches=rbsrt.keepbranchesf, |
General Comments 0
You need to be logged in to leave comments.
Login now