##// END OF EJS Templates
rebase: remove sortedstate-related confusion...
Kostia Balytskyi -
r29552:db26925b default
parent child Browse files
Show More
@@ -335,10 +335,10 b' class rebaseruntime(object):'
335 if self.activebookmark:
335 if self.activebookmark:
336 bookmarks.deactivate(repo)
336 bookmarks.deactivate(repo)
337
337
338 self.sortedstate = sorted(self.state)
338 sortedrevs = sorted(self.state)
339 total = len(self.sortedstate)
339 total = len(self.state)
340 pos = 0
340 pos = 0
341 for rev in self.sortedstate:
341 for rev in sortedrevs:
342 ctx = repo[rev]
342 ctx = repo[rev]
343 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
343 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
344 ctx.description().split('\n', 1)[0])
344 ctx.description().split('\n', 1)[0])
@@ -438,7 +438,7 b' class rebaseruntime(object):'
438 commitmsg += '\n* %s' % repo[rebased].description()
438 commitmsg += '\n* %s' % repo[rebased].description()
439 editopt = True
439 editopt = True
440 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
440 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
441 revtoreuse = self.sortedstate[-1]
441 revtoreuse = max(self.state)
442 newnode = concludenode(repo, revtoreuse, p1, self.external,
442 newnode = concludenode(repo, revtoreuse, p1, self.external,
443 commitmsg=commitmsg,
443 commitmsg=commitmsg,
444 extrafn=_makeextrafn(self.extrafns),
444 extrafn=_makeextrafn(self.extrafns),
General Comments 0
You need to be logged in to leave comments. Login now