| martinvonz |
| hg-reviewers |
The state is no longer used after calculating "self.external", therefore
removed.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| self.external = nullrev | self.external = nullrev | ||||
| # Mapping between the old revision id and either what is the new rebased | # Mapping between the old revision id and either what is the new rebased | ||||
| # revision or what needs to be done with the old revision. The state | # revision or what needs to be done with the old revision. The state | ||||
| # dict will be what contains most of the rebase progress state. | # dict will be what contains most of the rebase progress state. | ||||
| self.state = {} | self.state = {} | ||||
| self.activebookmark = None | self.activebookmark = None | ||||
| self.dest = None | self.dest = None | ||||
| self.skipped = set() | self.skipped = set() | ||||
| self.destancestors = set() | |||||
| self.collapsef = opts.get('collapse', False) | self.collapsef = opts.get('collapse', False) | ||||
| self.collapsemsg = cmdutil.logmessage(ui, opts) | self.collapsemsg = cmdutil.logmessage(ui, opts) | ||||
| self.date = opts.get('date', None) | self.date = opts.get('date', None) | ||||
| e = opts.get('extrafn') # internal, used by e.g. hgsubversion | e = opts.get('extrafn') # internal, used by e.g. hgsubversion | ||||
| self.extrafns = [_savegraft] | self.extrafns = [_savegraft] | ||||
| if e: | if e: | ||||
| for root in self.repo.set('roots(%ld)', rebaseset): | for root in self.repo.set('roots(%ld)', rebaseset): | ||||
| if not self.keepf and not root.mutable(): | if not self.keepf and not root.mutable(): | ||||
| raise error.Abort(_("can't rebase public changeset %s") | raise error.Abort(_("can't rebase public changeset %s") | ||||
| % root, | % root, | ||||
| hint=_("see 'hg help phases' for details")) | hint=_("see 'hg help phases' for details")) | ||||
| (self.originalwd, self.dest, self.state) = result | (self.originalwd, self.dest, self.state) = result | ||||
| if self.collapsef: | if self.collapsef: | ||||
| self.destancestors = self.repo.changelog.ancestors( | destancestors = self.repo.changelog.ancestors([self.dest], | ||||
| [self.dest], | |||||
| inclusive=True) | inclusive=True) | ||||
| self.external = externalparent(self.repo, self.state, | self.external = externalparent(self.repo, self.state, destancestors) | ||||
| self.destancestors) | |||||
| if dest.closesbranch() and not self.keepbranchesf: | if dest.closesbranch() and not self.keepbranchesf: | ||||
| self.ui.status(_('reopening closed branch head %s\n') % dest) | self.ui.status(_('reopening closed branch head %s\n') % dest) | ||||
| def _performrebase(self, tr): | def _performrebase(self, tr): | ||||
| repo, ui, opts = self.repo, self.ui, self.opts | repo, ui, opts = self.repo, self.ui, self.opts | ||||
| if self.keepbranchesf: | if self.keepbranchesf: | ||||
| # insert _savebranch at the start of extrafns so if | # insert _savebranch at the start of extrafns so if | ||||
| # there's a user-provided extrafn it can clobber branch if | # there's a user-provided extrafn it can clobber branch if | ||||
| # desired | # desired | ||||
| self.extrafns.insert(0, _savebranch) | self.extrafns.insert(0, _savebranch) | ||||
| if self.collapsef: | if self.collapsef: | ||||
| branches = set() | branches = set() | ||||
| for rev in self.state: | for rev in self.state: | ||||
| branches.add(repo[rev].branch()) | branches.add(repo[rev].branch()) | ||||
| if len(branches) > 1: | if len(branches) > 1: | ||||
| raise error.Abort(_('cannot collapse multiple named ' | raise error.Abort(_('cannot collapse multiple named ' | ||||
| 'branches')) | 'branches')) | ||||
| # Rebase | |||||
| if not self.destancestors: | |||||
| self.destancestors = repo.changelog.ancestors([self.dest], | |||||
| inclusive=True) | |||||
| # Keep track of the active bookmarks in order to reset them later | # Keep track of the active bookmarks in order to reset them later | ||||
| self.activebookmark = self.activebookmark or repo._activebookmark | self.activebookmark = self.activebookmark or repo._activebookmark | ||||
| if self.activebookmark: | if self.activebookmark: | ||||
| bookmarks.deactivate(repo) | bookmarks.deactivate(repo) | ||||
| # Store the state before we begin so users can run 'hg rebase --abort' | # Store the state before we begin so users can run 'hg rebase --abort' | ||||
| # if we fail before the transaction closes. | # if we fail before the transaction closes. | ||||
| self.storestatus() | self.storestatus() | ||||