This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5392

rebase: move abort() onto rebaseruntime
ClosedPublic

Authored by martinvonz on Dec 6 2018, 12:14 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc8eb8d1fc6cf: rebase: move abort() onto rebaseruntime
Summary

The function depends on a lot of the state of rebaseruntime, so it
makes sense for it to be an instance method. This will let us remove
many of the arguments to the method. That will be done in a later
patch.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 6 2018, 12:14 AM
Closed by commit rHGc8eb8d1fc6cf: rebase: move abort() onto rebaseruntime (authored by martinvonz). · Explain WhyDec 6 2018, 7:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (124 lines)

Diff 12752

hgext/rebase.py

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 abort(self.repo, self.originalwd, self.destmap, self.state, return self._abort(self.repo, self.originalwd, self.destmap,
activebookmark=self.activebookmark, backup=backup, self.state, activebookmark=self.activebookmark,
suppwarns=suppwarns) 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,
backup=True, suppwarns=False):
'''Restore the repository to its original state. Additional args:
activebookmark: the name of the bookmark that should be active after the
restore'''
try:
# If the first commits in the rebased set get skipped during the
# rebase, their values within the state mapping will be the dest
# rev id. The rebased list must must not contain the dest rev
# (issue4896)
rebased = [s for r, s in state.items()
if s >= 0 and s != r and s != destmap[r]]
immutable = [d for d in rebased if not repo[d].mutable()]
cleanup = True
if immutable:
repo.ui.warn(_("warning: can't clean up public changesets %s\n")
% ', '.join(bytes(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details"))
cleanup = False
descendants = set()
if rebased:
descendants = set(repo.changelog.descendants(rebased))
if descendants - set(rebased):
repo.ui.warn(_("warning: new changesets detected on "
"destination branch, can't strip\n"))
cleanup = False
if cleanup:
shouldupdate = False
if rebased:
strippoints = [
c.node() for c in repo.set('roots(%ld)', rebased)]
updateifonnodes = set(rebased)
updateifonnodes.update(destmap.values())
updateifonnodes.add(originalwd)
shouldupdate = repo['.'].rev() in updateifonnodes
# Update away from the rebase if necessary
if shouldupdate or needupdate(repo, state):
mergemod.update(repo, originalwd, branchmerge=False,
force=True)
# Strip from the first rebased revision
if rebased:
repair.strip(repo.ui, repo, strippoints, backup=backup)
if activebookmark and activebookmark in repo._bookmarks:
bookmarks.activate(repo, activebookmark)
finally:
clearstatus(repo)
clearcollapsemsg(repo)
if not suppwarns:
repo.ui.warn(_('rebase aborted\n'))
return 0
@command('rebase', @command('rebase',
[('s', 'source', '', [('s', 'source', '',
_('rebase the specified changeset and descendants'), _('REV')), _('rebase the specified changeset and descendants'), _('REV')),
('b', 'base', '', ('b', 'base', '',
_('rebase everything from branching point of specified changeset'), _('rebase everything from branching point of specified changeset'),
_('REV')), _('REV')),
('r', 'rev', [], ('r', 'rev', [],
_('rebase these revisions'), _('rebase these revisions'),
# We should be standing on the first as-of-yet unrebased commit. # We should be standing on the first as-of-yet unrebased commit.
firstunrebased = min([old for old, new in state.iteritems() firstunrebased = min([old for old, new in state.iteritems()
if new == nullrev]) if new == nullrev])
if firstunrebased in parents: if firstunrebased in parents:
return True return True
return False return False
def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True,
suppwarns=False):
'''Restore the repository to its original state. Additional args:
activebookmark: the name of the bookmark that should be active after the
restore'''
try:
# If the first commits in the rebased set get skipped during the rebase,
# their values within the state mapping will be the dest rev id. The
# rebased list must must not contain the dest rev (issue4896)
rebased = [s for r, s in state.items()
if s >= 0 and s != r and s != destmap[r]]
immutable = [d for d in rebased if not repo[d].mutable()]
cleanup = True
if immutable:
repo.ui.warn(_("warning: can't clean up public changesets %s\n")
% ', '.join(bytes(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details"))
cleanup = False
descendants = set()
if rebased:
descendants = set(repo.changelog.descendants(rebased))
if descendants - set(rebased):
repo.ui.warn(_("warning: new changesets detected on destination "
"branch, can't strip\n"))
cleanup = False
if cleanup:
shouldupdate = False
if rebased:
strippoints = [
c.node() for c in repo.set('roots(%ld)', rebased)]
updateifonnodes = set(rebased)
updateifonnodes.update(destmap.values())
updateifonnodes.add(originalwd)
shouldupdate = repo['.'].rev() in updateifonnodes
# Update away from the rebase if necessary
if shouldupdate or needupdate(repo, state):
mergemod.update(repo, originalwd, branchmerge=False, force=True)
# Strip from the first rebased revision
if rebased:
repair.strip(repo.ui, repo, strippoints, backup=backup)
if activebookmark and activebookmark in repo._bookmarks:
bookmarks.activate(repo, activebookmark)
finally:
clearstatus(repo)
clearcollapsemsg(repo)
if not suppwarns:
repo.ui.warn(_('rebase aborted\n'))
return 0
def sortsource(destmap): def sortsource(destmap):
"""yield source revisions in an order that we only rebase things once """yield source revisions in an order that we only rebase things once
If source and destination overlaps, we should filter out revisions If source and destination overlaps, we should filter out revisions
depending on other revisions which hasn't been rebased yet. depending on other revisions which hasn't been rebased yet.
Yield a sorted list of revisions each time. Yield a sorted list of revisions each time.