| hg-reviewers |
Since _abort() is now an instance method, we don't need to pass state
that's available on "self".
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| return 0 | return 0 | ||||
| else: | else: | ||||
| msg = _('cannot continue inconsistent rebase') | msg = _('cannot continue inconsistent rebase') | ||||
| hint = _('use "hg rebase --abort" to clear broken state') | hint = _('use "hg rebase --abort" to clear broken state') | ||||
| raise error.Abort(msg, hint=hint) | raise error.Abort(msg, hint=hint) | ||||
| if isabort: | if isabort: | ||||
| backup = backup and self.backupf | backup = backup and self.backupf | ||||
| return self._abort(self.repo, self.originalwd, self.destmap, | return self._abort(backup=backup, suppwarns=suppwarns) | ||||
| self.state, activebookmark=self.activebookmark, | |||||
| backup=backup, suppwarns=suppwarns) | |||||
| def _preparenewrebase(self, destmap): | def _preparenewrebase(self, destmap): | ||||
| if not destmap: | if not destmap: | ||||
| return _nothingtorebase() | return _nothingtorebase() | ||||
| rebaseset = destmap.keys() | rebaseset = destmap.keys() | ||||
| allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt) | allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt) | ||||
| if (not (self.keepf or allowunstable) | if (not (self.keepf or allowunstable) | ||||
| skippedlen = len(self.skipped) | skippedlen = len(self.skipped) | ||||
| ui.note(_("%d revisions have been skipped\n") % skippedlen) | ui.note(_("%d revisions have been skipped\n") % skippedlen) | ||||
| fm.end() | fm.end() | ||||
| if (self.activebookmark and self.activebookmark in repo._bookmarks and | if (self.activebookmark and self.activebookmark in repo._bookmarks and | ||||
| repo['.'].node() == repo._bookmarks[self.activebookmark]): | repo['.'].node() == repo._bookmarks[self.activebookmark]): | ||||
| bookmarks.activate(repo, self.activebookmark) | bookmarks.activate(repo, self.activebookmark) | ||||
| def _abort(self, repo, originalwd, destmap, state, activebookmark=None, | def _abort(self, backup=True, suppwarns=False): | ||||
| backup=True, suppwarns=False): | '''Restore the repository to its original state.''' | ||||
| '''Restore the repository to its original state. Additional args: | |||||
| activebookmark: the name of the bookmark that should be active after the | |||||
| restore''' | |||||
| repo = self.repo | |||||
| try: | try: | ||||
| # If the first commits in the rebased set get skipped during the | # If the first commits in the rebased set get skipped during the | ||||
| # rebase, their values within the state mapping will be the dest | # rebase, their values within the state mapping will be the dest | ||||
| # rev id. The rebased list must must not contain the dest rev | # rev id. The rebased list must must not contain the dest rev | ||||
| # (issue4896) | # (issue4896) | ||||
| rebased = [s for r, s in state.items() | rebased = [s for r, s in self.state.items() | ||||
| if s >= 0 and s != r and s != destmap[r]] | if s >= 0 and s != r and s != self.destmap[r]] | ||||
| immutable = [d for d in rebased if not repo[d].mutable()] | immutable = [d for d in rebased if not repo[d].mutable()] | ||||
| cleanup = True | cleanup = True | ||||
| if immutable: | if immutable: | ||||
| repo.ui.warn(_("warning: can't clean up public changesets %s\n") | repo.ui.warn(_("warning: can't clean up public changesets %s\n") | ||||
| % ', '.join(bytes(repo[r]) for r in immutable), | % ', '.join(bytes(repo[r]) for r in immutable), | ||||
| hint=_("see 'hg help phases' for details")) | hint=_("see 'hg help phases' for details")) | ||||
| cleanup = False | cleanup = False | ||||
| descendants = set() | descendants = set() | ||||
| if rebased: | if rebased: | ||||
| descendants = set(repo.changelog.descendants(rebased)) | descendants = set(repo.changelog.descendants(rebased)) | ||||
| if descendants - set(rebased): | if descendants - set(rebased): | ||||
| repo.ui.warn(_("warning: new changesets detected on " | repo.ui.warn(_("warning: new changesets detected on " | ||||
| "destination branch, can't strip\n")) | "destination branch, can't strip\n")) | ||||
| cleanup = False | cleanup = False | ||||
| if cleanup: | if cleanup: | ||||
| shouldupdate = False | shouldupdate = False | ||||
| if rebased: | if rebased: | ||||
| strippoints = [ | strippoints = [ | ||||
| c.node() for c in repo.set('roots(%ld)', rebased)] | c.node() for c in repo.set('roots(%ld)', rebased)] | ||||
| updateifonnodes = set(rebased) | updateifonnodes = set(rebased) | ||||
| updateifonnodes.update(destmap.values()) | updateifonnodes.update(self.destmap.values()) | ||||
| updateifonnodes.add(originalwd) | updateifonnodes.add(self.originalwd) | ||||
| shouldupdate = repo['.'].rev() in updateifonnodes | shouldupdate = repo['.'].rev() in updateifonnodes | ||||
| # Update away from the rebase if necessary | # Update away from the rebase if necessary | ||||
| if shouldupdate or needupdate(repo, state): | if shouldupdate or needupdate(repo, self.state): | ||||
| mergemod.update(repo, originalwd, branchmerge=False, | mergemod.update(repo, self.originalwd, branchmerge=False, | ||||
| force=True) | force=True) | ||||
| # Strip from the first rebased revision | # Strip from the first rebased revision | ||||
| if rebased: | if rebased: | ||||
| repair.strip(repo.ui, repo, strippoints, backup=backup) | repair.strip(repo.ui, repo, strippoints, backup=backup) | ||||
| if activebookmark and activebookmark in repo._bookmarks: | if self.activebookmark and self.activebookmark in repo._bookmarks: | ||||
| bookmarks.activate(repo, activebookmark) | bookmarks.activate(repo, self.activebookmark) | ||||
| finally: | finally: | ||||
| clearstatus(repo) | clearstatus(repo) | ||||
| clearcollapsemsg(repo) | clearcollapsemsg(repo) | ||||
| if not suppwarns: | if not suppwarns: | ||||
| repo.ui.warn(_('rebase aborted\n')) | repo.ui.warn(_('rebase aborted\n')) | ||||
| return 0 | return 0 | ||||