| martinvonz |
| hg-reviewers |
Now the minimal value of state is revtodo, that condition is always true,
therefore removed.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| self.dest, self.state) | self.dest, self.state) | ||||
| editopt = opts.get('edit') | editopt = opts.get('edit') | ||||
| editform = 'rebase.collapse' | editform = 'rebase.collapse' | ||||
| if self.collapsemsg: | if self.collapsemsg: | ||||
| commitmsg = self.collapsemsg | commitmsg = self.collapsemsg | ||||
| else: | else: | ||||
| commitmsg = 'Collapsed revision' | commitmsg = 'Collapsed revision' | ||||
| for rebased in sorted(self.state): | for rebased in sorted(self.state): | ||||
| if rebased not in self.skipped and\ | if rebased not in self.skipped: | ||||
| self.state[rebased] >= revtodo: | |||||
| commitmsg += '\n* %s' % repo[rebased].description() | commitmsg += '\n* %s' % repo[rebased].description() | ||||
| editopt = True | editopt = True | ||||
| editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | ||||
| revtoreuse = max(self.state) | revtoreuse = max(self.state) | ||||
| dsguard = None | dsguard = None | ||||
| if ui.configbool('rebase', 'singletransaction'): | if ui.configbool('rebase', 'singletransaction'): | ||||
| dsguard = dirstateguard.dirstateguard(repo, 'rebase') | dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||||
| with util.acceptintervention(dsguard): | with util.acceptintervention(dsguard): | ||||
| newnode = concludenode(repo, revtoreuse, p1, self.external, | newnode = concludenode(repo, revtoreuse, p1, self.external, | ||||
| commitmsg=commitmsg, | commitmsg=commitmsg, | ||||
| extrafn=_makeextrafn(self.extrafns), | extrafn=_makeextrafn(self.extrafns), | ||||
| editor=editor, | editor=editor, | ||||
| keepbranches=self.keepbranchesf, | keepbranches=self.keepbranchesf, | ||||
| date=self.date) | date=self.date) | ||||
| if newnode is None: | if newnode is None: | ||||
| newrev = self.dest | newrev = self.dest | ||||
| else: | else: | ||||
| newrev = repo[newnode].rev() | newrev = repo[newnode].rev() | ||||
| for oldrev in self.state.iterkeys(): | for oldrev in self.state.iterkeys(): | ||||
| if self.state[oldrev] >= revtodo: | |||||
| self.state[oldrev] = newrev | self.state[oldrev] = newrev | ||||
| if 'qtip' in repo.tags(): | if 'qtip' in repo.tags(): | ||||
| updatemq(repo, self.state, self.skipped, **opts) | updatemq(repo, self.state, self.skipped, **opts) | ||||
| # restore original working directory | # restore original working directory | ||||
| # (we do this before stripping) | # (we do this before stripping) | ||||
| newwd = self.state.get(self.originalwd, self.originalwd) | newwd = self.state.get(self.originalwd, self.originalwd) | ||||
| if newwd < 0: | if newwd < 0: | ||||