equal
deleted
inserted
replaced
333 self.currentbookmarks = repo._bookmarks.copy() |
333 self.currentbookmarks = repo._bookmarks.copy() |
334 self.activebookmark = self.activebookmark or repo._activebookmark |
334 self.activebookmark = self.activebookmark or repo._activebookmark |
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]) |
345 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
345 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
346 if names: |
346 if names: |
436 if rebased not in self.skipped and\ |
436 if rebased not in self.skipped and\ |
437 self.state[rebased] > nullmerge: |
437 self.state[rebased] > nullmerge: |
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), |
445 editor=editor, |
445 editor=editor, |
446 keepbranches=self.keepbranchesf, |
446 keepbranches=self.keepbranchesf, |