rebase.py
1550 lines
| 60.7 KiB
| text/x-python
|
PythonLexer
/ hgext / rebase.py
|
r6906 | # rebase.py - rebasing feature for mercurial | ||
# | ||||
# Copyright 2008 Stefano Tortarolo <stefano.tortarolo at gmail dot com> | ||||
# | ||||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r6906 | |||
|
r8934 | '''command to move sets of revisions to a different ancestor | ||
|
r6906 | |||
|
r7999 | This extension lets you rebase changesets in an existing Mercurial | ||
repository. | ||||
|
r6906 | |||
For more information: | ||||
|
r26421 | https://mercurial-scm.org/wiki/RebaseExtension | ||
|
r6906 | ''' | ||
|
r29128 | from __future__ import absolute_import | ||
import errno | ||||
import os | ||||
|
r29205 | |||
from mercurial.i18n import _ | ||||
from mercurial.node import ( | ||||
hex, | ||||
nullid, | ||||
nullrev, | ||||
short, | ||||
) | ||||
|
r29128 | from mercurial import ( | ||
bookmarks, | ||||
cmdutil, | ||||
commands, | ||||
copies, | ||||
destutil, | ||||
|
r30490 | dirstateguard, | ||
|
r29128 | error, | ||
extensions, | ||||
hg, | ||||
lock, | ||||
|
r30271 | merge as mergemod, | ||
|
r30495 | mergeutil, | ||
|
r29128 | obsolete, | ||
r33146 | obsutil, | |||
|
r29128 | patch, | ||
phases, | ||||
registrar, | ||||
repair, | ||||
repoview, | ||||
revset, | ||||
scmutil, | ||||
|
r31023 | smartset, | ||
|
r29128 | util, | ||
) | ||||
release = lock.release | ||||
|
r32375 | templateopts = cmdutil.templateopts | ||
|
r6906 | |||
|
r26669 | # The following constants are used throughout the rebase module. The ordering of | ||
# their values must be maintained. | ||||
# Indicates that a revision needs to be rebased | ||||
|
r23490 | revtodo = -1 | ||
|
r10352 | nullmerge = -2 | ||
|
r18447 | revignored = -3 | ||
|
r27013 | # successor in rebase destination | ||
|
r26349 | revprecursor = -4 | ||
|
r27013 | # plain prune (no successor) | ||
|
r27012 | revpruned = -5 | ||
|
r27014 | revskipped = (revignored, revprecursor, revpruned) | ||
|
r10352 | |||
|
r14306 | cmdtable = {} | ||
|
r32337 | command = registrar.command(cmdtable) | ||
|
r29841 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||
|
r25186 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||
# be specifying the version(s) of Mercurial they are tested with, or | ||||
# leave the attribute unspecified. | ||||
|
r29841 | testedwith = 'ships-with-hg-core' | ||
|
r14306 | |||
|
r26671 | def _nothingtorebase(): | ||
return 1 | ||||
|
r27976 | def _savegraft(ctx, extra): | ||
s = ctx.extra().get('source', None) | ||||
if s is not None: | ||||
extra['source'] = s | ||||
s = ctx.extra().get('intermediate-source', None) | ||||
if s is not None: | ||||
extra['intermediate-source'] = s | ||||
def _savebranch(ctx, extra): | ||||
extra['branch'] = ctx.branch() | ||||
|
r19860 | def _makeextrafn(copiers): | ||
"""make an extrafn out of the given copy-functions. | ||||
A copy function takes a context and an extra dict, and mutates the | ||||
extra dict as needed based on the given context. | ||||
""" | ||||
def extrafn(ctx, extra): | ||||
for c in copiers: | ||||
c(ctx, extra) | ||||
return extrafn | ||||
|
r29043 | def _destrebase(repo, sourceset, destspace=None): | ||
|
r28189 | """small wrapper around destmerge to pass the right extra args | ||
Please wrap destutil.destmerge instead.""" | ||||
return destutil.destmerge(repo, action='rebase', sourceset=sourceset, | ||||
|
r29043 | onheadcheck=False, destspace=destspace) | ||
|
r26717 | |||
|
r28394 | revsetpredicate = registrar.revsetpredicate() | ||
|
r27586 | |||
@revsetpredicate('_destrebase') | ||||
|
r26719 | def _revsetdestrebase(repo, subset, x): | ||
|
r26301 | # ``_rebasedefaultdest()`` | ||
# default destination for rebase. | ||||
# # XXX: Currently private because I expect the signature to change. | ||||
# # XXX: - bailing out in case of ambiguity vs returning all data. | ||||
# i18n: "_rebasedefaultdest" is a keyword | ||||
|
r28189 | sourceset = None | ||
if x is not None: | ||||
|
r31023 | sourceset = revset.getset(repo, smartset.fullreposet(repo), x) | ||
return subset & smartset.baseset([_destrebase(repo, sourceset)]) | ||||
|
r26301 | |||
|
r29358 | class rebaseruntime(object): | ||
"""This class is a container for rebase runtime state""" | ||||
|
r29399 | def __init__(self, repo, ui, opts=None): | ||
if opts is None: | ||||
opts = {} | ||||
self.repo = repo | ||||
self.ui = ui | ||||
self.opts = opts | ||||
|
r29358 | self.originalwd = None | ||
self.external = nullrev | ||||
# 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 | ||||
# dict will be what contains most of the rebase progress state. | ||||
self.state = {} | ||||
self.activebookmark = None | ||||
|
r32248 | self.dest = None | ||
|
r29360 | self.skipped = set() | ||
|
r32248 | self.destancestors = set() | ||
|
r29358 | |||
|
r29400 | self.collapsef = opts.get('collapse', False) | ||
self.collapsemsg = cmdutil.logmessage(ui, opts) | ||||
|
r29401 | self.date = opts.get('date', None) | ||
e = opts.get('extrafn') # internal, used by e.g. hgsubversion | ||||
self.extrafns = [_savegraft] | ||||
if e: | ||||
self.extrafns = [e] | ||||
|
r29400 | |||
|
r29402 | self.keepf = opts.get('keep', False) | ||
self.keepbranchesf = opts.get('keepbranches', False) | ||||
# keepopen is not meant for use on the command line, but by | ||||
# other extensions | ||||
self.keepopen = opts.get('keepopen', False) | ||||
|
r29404 | self.obsoletenotrebased = {} | ||
|
r29402 | |||
|
r31224 | def storestatus(self, tr=None): | ||
|
r31223 | """Store the current status to allow recovery""" | ||
|
r31224 | if tr: | ||
tr.addfilegenerator('rebasestate', ('rebasestate',), | ||||
self._writestatus, location='plain') | ||||
else: | ||||
with self.repo.vfs("rebasestate", "w") as f: | ||||
self._writestatus(f) | ||||
def _writestatus(self, f): | ||||
|
r31619 | repo = self.repo.unfiltered() | ||
|
r31223 | f.write(repo[self.originalwd].hex() + '\n') | ||
|
r32248 | f.write(repo[self.dest].hex() + '\n') | ||
|
r31223 | f.write(repo[self.external].hex() + '\n') | ||
f.write('%d\n' % int(self.collapsef)) | ||||
f.write('%d\n' % int(self.keepf)) | ||||
f.write('%d\n' % int(self.keepbranchesf)) | ||||
f.write('%s\n' % (self.activebookmark or '')) | ||||
for d, v in self.state.iteritems(): | ||||
oldrev = repo[d].hex() | ||||
if v >= 0: | ||||
newrev = repo[v].hex() | ||||
elif v == revtodo: | ||||
# To maintain format compatibility, we have to use nullid. | ||||
# Please do remove this special case when upgrading the format. | ||||
newrev = hex(nullid) | ||||
else: | ||||
newrev = v | ||||
f.write("%s:%s\n" % (oldrev, newrev)) | ||||
repo.ui.debug('rebase status stored\n') | ||||
|
r29403 | def restorestatus(self): | ||
"""Restore a previously stored status""" | ||||
repo = self.repo | ||||
keepbranches = None | ||||
|
r32248 | dest = None | ||
|
r29403 | collapse = False | ||
external = nullrev | ||||
activebookmark = None | ||||
state = {} | ||||
try: | ||||
f = repo.vfs("rebasestate") | ||||
for i, l in enumerate(f.read().splitlines()): | ||||
if i == 0: | ||||
originalwd = repo[l].rev() | ||||
elif i == 1: | ||||
|
r32248 | dest = repo[l].rev() | ||
|
r29403 | elif i == 2: | ||
external = repo[l].rev() | ||||
elif i == 3: | ||||
collapse = bool(int(l)) | ||||
elif i == 4: | ||||
keep = bool(int(l)) | ||||
elif i == 5: | ||||
keepbranches = bool(int(l)) | ||||
elif i == 6 and not (len(l) == 81 and ':' in l): | ||||
# line 6 is a recent addition, so for backwards | ||||
# compatibility check that the line doesn't look like the | ||||
# oldrev:newrev lines | ||||
activebookmark = l | ||||
else: | ||||
oldrev, newrev = l.split(':') | ||||
if newrev in (str(nullmerge), str(revignored), | ||||
str(revprecursor), str(revpruned)): | ||||
state[repo[oldrev].rev()] = int(newrev) | ||||
elif newrev == nullid: | ||||
state[repo[oldrev].rev()] = revtodo | ||||
# Legacy compat special case | ||||
else: | ||||
state[repo[oldrev].rev()] = repo[newrev].rev() | ||||
except IOError as err: | ||||
if err.errno != errno.ENOENT: | ||||
raise | ||||
cmdutil.wrongtooltocontinue(repo, _('rebase')) | ||||
if keepbranches is None: | ||||
raise error.Abort(_('.hg/rebasestate is incomplete')) | ||||
skipped = set() | ||||
# recompute the set of skipped revs | ||||
if not collapse: | ||||
|
r32291 | seen = {dest} | ||
|
r29403 | for old, new in sorted(state.items()): | ||
if new != revtodo and new in seen: | ||||
skipped.add(old) | ||||
seen.add(new) | ||||
repo.ui.debug('computed skipped revs: %s\n' % | ||||
(' '.join(str(r) for r in sorted(skipped)) or None)) | ||||
repo.ui.debug('rebase status resumed\n') | ||||
|
r32291 | _setrebasesetvisibility(repo, set(state.keys()) | {originalwd}) | ||
|
r29403 | |||
self.originalwd = originalwd | ||||
|
r32248 | self.dest = dest | ||
|
r29403 | self.state = state | ||
self.skipped = skipped | ||||
self.collapsef = collapse | ||||
self.keepf = keep | ||||
self.keepbranchesf = keepbranches | ||||
self.external = external | ||||
self.activebookmark = activebookmark | ||||
|
r32248 | def _handleskippingobsolete(self, rebaserevs, obsoleterevs, dest): | ||
|
r29479 | """Compute structures necessary for skipping obsolete revisions | ||
rebaserevs: iterable of all revisions that are to be rebased | ||||
obsoleterevs: iterable of all obsolete revisions in rebaseset | ||||
|
r32248 | dest: a destination revision for the rebase operation | ||
|
r29479 | """ | ||
self.obsoletenotrebased = {} | ||||
if not self.ui.configbool('experimental', 'rebaseskipobsolete', | ||||
default=True): | ||||
return | ||||
rebaseset = set(rebaserevs) | ||||
obsoleteset = set(obsoleterevs) | ||||
self.obsoletenotrebased = _computeobsoletenotrebased(self.repo, | ||||
|
r32248 | obsoleteset, dest) | ||
|
r29479 | skippedset = set(self.obsoletenotrebased) | ||
_checkobsrebase(self.repo, self.ui, obsoleteset, rebaseset, skippedset) | ||||
|
r29472 | def _prepareabortorcontinue(self, isabort): | ||
try: | ||||
self.restorestatus() | ||||
|
r31225 | self.collapsemsg = restorecollapsemsg(self.repo, isabort) | ||
|
r29472 | except error.RepoLookupError: | ||
if isabort: | ||||
clearstatus(self.repo) | ||||
clearcollapsemsg(self.repo) | ||||
self.repo.ui.warn(_('rebase aborted (no revision is removed,' | ||||
' only broken state is cleared)\n')) | ||||
return 0 | ||||
else: | ||||
msg = _('cannot continue inconsistent rebase') | ||||
hint = _('use "hg rebase --abort" to clear broken state') | ||||
raise error.Abort(msg, hint=hint) | ||||
if isabort: | ||||
|
r32248 | return abort(self.repo, self.originalwd, self.dest, | ||
|
r29472 | self.state, activebookmark=self.activebookmark) | ||
|
r29479 | obsrevs = (r for r, st in self.state.items() if st == revprecursor) | ||
|
r32248 | self._handleskippingobsolete(self.state.keys(), obsrevs, self.dest) | ||
|
r29472 | |||
|
r29473 | def _preparenewrebase(self, dest, rebaseset): | ||
if dest is None: | ||||
return _nothingtorebase() | ||||
allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt) | ||||
if (not (self.keepf or allowunstable) | ||||
and self.repo.revs('first(children(%ld) - %ld)', | ||||
rebaseset, rebaseset)): | ||||
raise error.Abort( | ||||
_("can't remove original changesets with" | ||||
" unrebased descendants"), | ||||
hint=_('use --keep to keep original changesets')) | ||||
|
r29610 | obsrevs = _filterobsoleterevs(self.repo, set(rebaseset)) | ||
|
r33158 | self._handleskippingobsolete(rebaseset, obsrevs, dest.rev()) | ||
|
r29473 | |||
result = buildstate(self.repo, dest, rebaseset, self.collapsef, | ||||
self.obsoletenotrebased) | ||||
if not result: | ||||
# Empty state built, nothing to rebase | ||||
self.ui.status(_('nothing to rebase\n')) | ||||
return _nothingtorebase() | ||||
|
r31302 | for root in self.repo.set('roots(%ld)', rebaseset): | ||
if not self.keepf and not root.mutable(): | ||||
raise error.Abort(_("can't rebase public changeset %s") | ||||
% root, | ||||
hint=_("see 'hg help phases' for details")) | ||||
|
r29473 | |||
|
r32248 | (self.originalwd, self.dest, self.state) = result | ||
|
r29473 | if self.collapsef: | ||
|
r32248 | self.destancestors = self.repo.changelog.ancestors( | ||
[self.dest], | ||||
|
r29473 | inclusive=True) | ||
self.external = externalparent(self.repo, self.state, | ||||
|
r32248 | self.destancestors) | ||
|
r29473 | |||
if dest.closesbranch() and not self.keepbranchesf: | ||||
self.ui.status(_('reopening closed branch head %s\n') % dest) | ||||
|
r33569 | def _performrebase(self, tr): | ||
|
r29477 | repo, ui, opts = self.repo, self.ui, self.opts | ||
if self.keepbranchesf: | ||||
# insert _savebranch at the start of extrafns so if | ||||
# there's a user-provided extrafn it can clobber branch if | ||||
# desired | ||||
self.extrafns.insert(0, _savebranch) | ||||
if self.collapsef: | ||||
branches = set() | ||||
for rev in self.state: | ||||
branches.add(repo[rev].branch()) | ||||
if len(branches) > 1: | ||||
raise error.Abort(_('cannot collapse multiple named ' | ||||
'branches')) | ||||
# Rebase | ||||
|
r32248 | if not self.destancestors: | ||
self.destancestors = repo.changelog.ancestors([self.dest], | ||||
inclusive=True) | ||||
|
r29477 | |||
|
r33332 | # Keep track of the active bookmarks in order to reset them later | ||
|
r29477 | self.activebookmark = self.activebookmark or repo._activebookmark | ||
if self.activebookmark: | ||||
bookmarks.deactivate(repo) | ||||
|
r31225 | # Store the state before we begin so users can run 'hg rebase --abort' | ||
# if we fail before the transaction closes. | ||||
self.storestatus() | ||||
|
r30007 | sortedrevs = repo.revs('sort(%ld, -topo)', self.state) | ||
|
r29872 | cands = [k for k, v in self.state.iteritems() if v == revtodo] | ||
total = len(cands) | ||||
|
r29477 | pos = 0 | ||
|
r29552 | for rev in sortedrevs: | ||
|
r29477 | ctx = repo[rev] | ||
desc = '%d:%s "%s"' % (ctx.rev(), ctx, | ||||
ctx.description().split('\n', 1)[0]) | ||||
names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | ||||
if names: | ||||
desc += ' (%s)' % ' '.join(names) | ||||
|
r32272 | if self.state[rev] == rev: | ||
ui.status(_('already rebased %s\n') % desc) | ||||
elif self.state[rev] == revtodo: | ||||
|
r29872 | pos += 1 | ||
|
r29477 | ui.status(_('rebasing %s\n') % desc) | ||
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), | ||||
_('changesets'), total) | ||||
|
r32248 | p1, p2, base = defineparents(repo, rev, self.dest, | ||
|
r29477 | self.state, | ||
|
r32248 | self.destancestors, | ||
|
r29477 | self.obsoletenotrebased) | ||
|
r33569 | self.storestatus(tr=tr) | ||
|
r29477 | storecollapsemsg(repo, self.collapsemsg) | ||
if len(repo[None].parents()) == 2: | ||||
repo.ui.debug('resuming interrupted rebase\n') | ||||
else: | ||||
try: | ||||
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ||||
'rebase') | ||||
stats = rebasenode(repo, rev, p1, base, self.state, | ||||
|
r32248 | self.collapsef, self.dest) | ||
|
r29477 | if stats and stats[3] > 0: | ||
raise error.InterventionRequired( | ||||
_('unresolved conflicts (see hg ' | ||||
'resolve, then hg rebase --continue)')) | ||||
finally: | ||||
ui.setconfig('ui', 'forcemerge', '', 'rebase') | ||||
if not self.collapsef: | ||||
merging = p2 != nullrev | ||||
editform = cmdutil.mergeeditform(merging, 'rebase') | ||||
editor = cmdutil.getcommiteditor(editform=editform, **opts) | ||||
newnode = concludenode(repo, rev, p1, p2, | ||||
|
r29551 | extrafn=_makeextrafn(self.extrafns), | ||
|
r29477 | editor=editor, | ||
keepbranches=self.keepbranchesf, | ||||
date=self.date) | ||||
|
r32313 | if newnode is None: | ||
# If it ended up being a no-op commit, then the normal | ||||
# merge state clean-up path doesn't happen, so do it | ||||
# here. Fix issue5494 | ||||
mergemod.mergestate.clean(repo) | ||||
|
r29477 | else: | ||
# Skip commit if we are collapsing | ||||
repo.setparents(repo[p1].node()) | ||||
newnode = None | ||||
# Update the state | ||||
if newnode is not None: | ||||
self.state[rev] = repo[newnode].rev() | ||||
ui.debug('rebased as %s\n' % short(newnode)) | ||||
else: | ||||
if not self.collapsef: | ||||
ui.warn(_('note: rebase of %d:%s created no changes ' | ||||
'to commit\n') % (rev, ctx)) | ||||
self.skipped.add(rev) | ||||
self.state[rev] = p1 | ||||
ui.debug('next revision set to %s\n' % p1) | ||||
elif self.state[rev] == nullmerge: | ||||
ui.debug('ignoring null merge rebase of %s\n' % rev) | ||||
elif self.state[rev] == revignored: | ||||
ui.status(_('not rebasing ignored %s\n') % desc) | ||||
elif self.state[rev] == revprecursor: | ||||
|
r32248 | destctx = repo[self.obsoletenotrebased[rev]] | ||
descdest = '%d:%s "%s"' % (destctx.rev(), destctx, | ||||
destctx.description().split('\n', 1)[0]) | ||||
|
r29477 | msg = _('note: not rebasing %s, already in destination as %s\n') | ||
|
r32248 | ui.status(msg % (desc, descdest)) | ||
|
r29477 | elif self.state[rev] == revpruned: | ||
msg = _('note: not rebasing %s, it has no successor\n') | ||||
ui.status(msg % desc) | ||||
else: | ||||
ui.status(_('already rebased %s as %s\n') % | ||||
(desc, repo[self.state[rev]])) | ||||
ui.progress(_('rebasing'), None) | ||||
ui.note(_('rebase merging completed\n')) | ||||
|
r29478 | def _finishrebase(self): | ||
repo, ui, opts = self.repo, self.ui, self.opts | ||||
if self.collapsef and not self.keepopen: | ||||
p1, p2, _base = defineparents(repo, min(self.state), | ||||
|
r32248 | self.dest, self.state, | ||
self.destancestors, | ||||
|
r29478 | self.obsoletenotrebased) | ||
editopt = opts.get('edit') | ||||
editform = 'rebase.collapse' | ||||
if self.collapsemsg: | ||||
commitmsg = self.collapsemsg | ||||
else: | ||||
commitmsg = 'Collapsed revision' | ||||
|
r33624 | for rebased in sorted(self.state): | ||
|
r29478 | if rebased not in self.skipped and\ | ||
self.state[rebased] > nullmerge: | ||||
commitmsg += '\n* %s' % repo[rebased].description() | ||||
editopt = True | ||||
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | ||||
|
r29552 | revtoreuse = max(self.state) | ||
|
r33621 | |||
dsguard = None | ||||
if ui.configbool('rebase', 'singletransaction'): | ||||
dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||||
with util.acceptintervention(dsguard): | ||||
newnode = concludenode(repo, revtoreuse, p1, self.external, | ||||
commitmsg=commitmsg, | ||||
extrafn=_makeextrafn(self.extrafns), | ||||
editor=editor, | ||||
keepbranches=self.keepbranchesf, | ||||
date=self.date) | ||||
|
r29478 | if newnode is None: | ||
|
r32248 | newrev = self.dest | ||
|
r29478 | else: | ||
newrev = repo[newnode].rev() | ||||
for oldrev in self.state.iterkeys(): | ||||
if self.state[oldrev] > nullmerge: | ||||
self.state[oldrev] = newrev | ||||
if 'qtip' in repo.tags(): | ||||
updatemq(repo, self.state, self.skipped, **opts) | ||||
# restore original working directory | ||||
# (we do this before stripping) | ||||
newwd = self.state.get(self.originalwd, self.originalwd) | ||||
if newwd == revprecursor: | ||||
newwd = self.obsoletenotrebased[self.originalwd] | ||||
elif newwd < 0: | ||||
# original directory is a parent of rebase set root or ignored | ||||
newwd = self.originalwd | ||||
if newwd not in [c.rev() for c in repo[None].parents()]: | ||||
ui.note(_("update back to initial working directory parent\n")) | ||||
hg.updaterepo(repo, newwd, False) | ||||
if not self.keepf: | ||||
collapsedas = None | ||||
if self.collapsef: | ||||
collapsedas = newnode | ||||
|
r33591 | clearrebased(ui, repo, self.dest, self.state, self.skipped, | ||
collapsedas) | ||||
|
r29478 | |||
clearstatus(repo) | ||||
clearcollapsemsg(repo) | ||||
ui.note(_("rebase completed\n")) | ||||
util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | ||||
if self.skipped: | ||||
skippedlen = len(self.skipped) | ||||
ui.note(_("%d revisions have been skipped\n") % skippedlen) | ||||
|
r33332 | if (self.activebookmark and self.activebookmark in repo._bookmarks and | ||
|
r29478 | repo['.'].node() == repo._bookmarks[self.activebookmark]): | ||
bookmarks.activate(repo, self.activebookmark) | ||||
|
r14306 | @command('rebase', | ||
[('s', 'source', '', | ||||
|
r22789 | _('rebase the specified changeset and descendants'), _('REV')), | ||
|
r14306 | ('b', 'base', '', | ||
|
r22789 | _('rebase everything from branching point of specified changeset'), | ||
|
r14306 | _('REV')), | ||
|
r15270 | ('r', 'rev', [], | ||
_('rebase these revisions'), | ||||
_('REV')), | ||||
|
r14306 | ('d', 'dest', '', | ||
_('rebase onto the specified changeset'), _('REV')), | ||||
('', 'collapse', False, _('collapse the rebased changesets')), | ||||
('m', 'message', '', | ||||
_('use text as collapse commit message'), _('TEXT')), | ||||
|
r15219 | ('e', 'edit', False, _('invoke editor on commit messages')), | ||
|
r14306 | ('l', 'logfile', '', | ||
_('read collapse commit message from file'), _('FILE')), | ||||
|
r25025 | ('k', 'keep', False, _('keep original changesets')), | ||
|
r14306 | ('', 'keepbranches', False, _('keep original branch names')), | ||
|
r17005 | ('D', 'detach', False, _('(DEPRECATED)')), | ||
|
r22382 | ('i', 'interactive', False, _('(DEPRECATED)')), | ||
|
r14306 | ('t', 'tool', '', _('specify merge tool')), | ||
('c', 'continue', False, _('continue an interrupted rebase')), | ||||
('a', 'abort', False, _('abort an interrupted rebase'))] + | ||||
templateopts, | ||||
|
r17325 | _('[-s REV | -b REV] [-d REV] [OPTION]')) | ||
|
r6906 | def rebase(ui, repo, **opts): | ||
"""move changeset (and descendants) to a different branch | ||||
|
r7999 | Rebase uses repeated merging to graft changesets from one part of | ||
|
r10646 | history (the source) onto another (the destination). This can be | ||
|
r11188 | useful for linearizing *local* changes relative to a master | ||
|
r10646 | development tree. | ||
|
r27454 | Published commits cannot be rebased (see :hg:`help phases`). | ||
To copy commits, see :hg:`help graft`. | ||||
|
r18516 | |||
|
r28189 | If you don't specify a destination changeset (``-d/--dest``), rebase | ||
will use the same logic as :hg:`merge` to pick a destination. if | ||||
the current branch contains exactly one other head, the other head | ||||
is merged with by default. Otherwise, an explicit revision with | ||||
which to merge with must be provided. (destination changeset is not | ||||
modified by rebasing, but new changesets are added as its | ||||
descendants.) | ||||
|
r10646 | |||
|
r27956 | Here are the ways to select changesets: | ||
|
r27455 | |||
1. Explicitly select them using ``--rev``. | ||||
|
r10646 | |||
|
r27455 | 2. Use ``--source`` to select a root changeset and include all of its | ||
|
r27959 | descendants. | ||
|
r27455 | |||
3. Use ``--base`` to select a changeset; rebase will find ancestors | ||||
|
r27959 | and their descendants which are not also ancestors of the destination. | ||
|
r18518 | |||
|
r27932 | 4. If you do not specify any of ``--rev``, ``source``, or ``--base``, | ||
|
r27959 | rebase will use ``--base .`` as above. | ||
|
r27932 | |||
|
r27456 | Rebase will destroy original changesets unless you use ``--keep``. | ||
It will also move your bookmarks (even if you do). | ||||
Some changesets may be dropped if they do not contribute changes | ||||
(e.g. merges from the destination branch). | ||||
|
r10646 | |||
|
r27457 | Unlike ``merge``, rebase will do nothing if you are at the branch tip of | ||
a named branch with two heads. You will need to explicitly specify source | ||||
and/or destination. | ||||
|
r6906 | |||
|
r28001 | If you need to use a tool to automate merge/conflict decisions, you | ||
can specify one with ``--tool``, see :hg:`help merge-tools`. | ||||
|
r28002 | As a caveat: the tool will not be used to mediate when a file was | ||
deleted, there is no hook presently available for this. | ||||
|
r28001 | |||
|
r27458 | If a rebase is interrupted to manually resolve a conflict, it can be | ||
|
r8076 | continued with --continue/-c or aborted with --abort/-a. | ||
|
r11205 | |||
|
r22790 | .. container:: verbose | ||
Examples: | ||||
- move "local changes" (current commit back to branching point) | ||||
to the current branch tip after a pull:: | ||||
hg rebase | ||||
- move a single changeset to the stable branch:: | ||||
hg rebase -r 5f493448 -d stable | ||||
- splice a commit and all its descendants onto another part of history:: | ||||
hg rebase --source c0c3 --dest 4cf9 | ||||
- rebase everything on a branch marked by a bookmark onto the | ||||
default branch:: | ||||
hg rebase --base myfeature --dest default | ||||
- collapse a sequence of changes into a single commit:: | ||||
hg rebase --collapse -r 1520:1525 -d . | ||||
- move a named branch while preserving its name:: | ||||
hg rebase -r "branch(featureX)" -d 1.3 --keepbranches | ||||
|
r31558 | Configuration Options: | ||
You can make rebase require a destination if you set the following config | ||||
|
r32085 | option:: | ||
|
r31558 | |||
[commands] | ||||
|
r32084 | rebase.requiredest = True | ||
|
r31558 | |||
|
r33569 | By default, rebase will close the transaction after each commit. For | ||
performance purposes, you can configure rebase to use a single transaction | ||||
across the entire rebase. WARNING: This setting introduces a significant | ||||
risk of losing the work you've done in a rebase if the rebase aborts | ||||
unexpectedly:: | ||||
[rebase] | ||||
singletransaction = True | ||||
|
r31558 | Return Values: | ||
|
r19971 | Returns 0 on success, 1 if nothing to rebase or there are | ||
unresolved conflicts. | ||||
|
r22790 | |||
|
r6906 | """ | ||
|
r29399 | rbsrt = rebaseruntime(repo, ui, opts) | ||
|
r15219 | |||
|
r32917 | with repo.wlock(), repo.lock(): | ||
|
r6906 | # Validate input and define rebasing points | ||
destf = opts.get('dest', None) | ||||
srcf = opts.get('source', None) | ||||
basef = opts.get('base', None) | ||||
|
r15270 | revf = opts.get('rev', []) | ||
|
r29043 | # search default destination in this space | ||
# used in the 'hg pull --rebase' case, see issue 5214. | ||||
destspace = opts.get('_destspace') | ||||
|
r6906 | contf = opts.get('continue') | ||
abortf = opts.get('abort') | ||||
|
r22382 | if opts.get('interactive'): | ||
|
r26496 | try: | ||
if extensions.find('histedit'): | ||||
enablehistedit = '' | ||||
except KeyError: | ||||
enablehistedit = " --config extensions.histedit=" | ||||
help = "hg%s help -e histedit" % enablehistedit | ||||
|
r22382 | msg = _("interactive history editing is supported by the " | ||
|
r26494 | "'histedit' extension (see \"%s\")") % help | ||
|
r26587 | raise error.Abort(msg) | ||
|
r22382 | |||
|
r29400 | if rbsrt.collapsemsg and not rbsrt.collapsef: | ||
|
r26587 | raise error.Abort( | ||
|
r13661 | _('message can only be specified with collapse')) | ||
|
r6906 | if contf or abortf: | ||
if contf and abortf: | ||||
|
r26587 | raise error.Abort(_('cannot use both abort and continue')) | ||
|
r29400 | if rbsrt.collapsef: | ||
|
r26587 | raise error.Abort( | ||
|
r11285 | _('cannot use collapse with continue or abort')) | ||
|
r8117 | if srcf or basef or destf: | ||
|
r26587 | raise error.Abort( | ||
|
r6906 | _('abort and continue do not allow specifying revisions')) | ||
|
r26165 | if abortf and opts.get('tool', False): | ||
|
r13856 | ui.warn(_('tool option will be ignored\n')) | ||
|
r30273 | if contf: | ||
ms = mergemod.mergestate.read(repo) | ||||
|
r30495 | mergeutil.checkunresolved(ms) | ||
|
r6906 | |||
|
r29472 | retcode = rbsrt._prepareabortorcontinue(abortf) | ||
if retcode is not None: | ||||
return retcode | ||||
|
r6906 | else: | ||
|
r29043 | dest, rebaseset = _definesets(ui, repo, destf, srcf, basef, revf, | ||
destspace=destspace) | ||||
|
r29473 | retcode = rbsrt._preparenewrebase(dest, rebaseset) | ||
if retcode is not None: | ||||
return retcode | ||||
|
r21027 | |||
|
r33569 | tr = None | ||
|
r33621 | dsguard = None | ||
singletr = ui.configbool('rebase', 'singletransaction') | ||||
if singletr: | ||||
|
r33569 | tr = repo.transaction('rebase') | ||
with util.acceptintervention(tr): | ||||
|
r33621 | if singletr: | ||
dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||||
with util.acceptintervention(dsguard): | ||||
rbsrt._performrebase(tr) | ||||
|
r33569 | |||
|
r29478 | rbsrt._finishrebase() | ||
|
r6906 | |||
|
r31395 | def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=None, | ||
|
r29043 | destspace=None): | ||
|
r28136 | """use revisions argument to define destination and rebase set | ||
""" | ||||
|
r31431 | if revf is None: | ||
revf = [] | ||||
|
r31395 | |||
|
r29043 | # destspace is here to work around issues with `hg pull --rebase` see | ||
# issue5214 for details | ||||
|
r28136 | if srcf and basef: | ||
raise error.Abort(_('cannot specify both a source and a base')) | ||||
if revf and basef: | ||||
raise error.Abort(_('cannot specify both a revision and a base')) | ||||
if revf and srcf: | ||||
raise error.Abort(_('cannot specify both a revision and a source')) | ||||
cmdutil.checkunfinished(repo) | ||||
cmdutil.bailifchanged(repo) | ||||
|
r31731 | if ui.configbool('commands', 'rebase.requiredest') and not destf: | ||
raise error.Abort(_('you must specify a destination'), | ||||
hint=_('use: hg rebase -d REV')) | ||||
|
r28136 | if destf: | ||
dest = scmutil.revsingle(repo, destf) | ||||
if revf: | ||||
rebaseset = scmutil.revrange(repo, revf) | ||||
if not rebaseset: | ||||
ui.status(_('empty "rev" revision set - nothing to rebase\n')) | ||||
return None, None | ||||
elif srcf: | ||||
src = scmutil.revrange(repo, [srcf]) | ||||
if not src: | ||||
ui.status(_('empty "source" revision set - nothing to rebase\n')) | ||||
return None, None | ||||
rebaseset = repo.revs('(%ld)::', src) | ||||
assert rebaseset | ||||
else: | ||||
base = scmutil.revrange(repo, [basef or '.']) | ||||
if not base: | ||||
ui.status(_('empty "base" revision set - ' | ||||
"can't compute rebase set\n")) | ||||
return None, None | ||||
|
r28189 | if not destf: | ||
|
r29043 | dest = repo[_destrebase(repo, base, destspace=destspace)] | ||
|
r28189 | destf = str(dest) | ||
|
r30580 | roots = [] # selected children of branching points | ||
bpbase = {} # {branchingpoint: [origbase]} | ||||
for b in base: # group bases by branching points | ||||
bp = repo.revs('ancestor(%d, %d)', b, dest).first() | ||||
bpbase[bp] = bpbase.get(bp, []) + [b] | ||||
if None in bpbase: | ||||
# emulate the old behavior, showing "nothing to rebase" (a better | ||||
# behavior may be abort with "cannot find branching point" error) | ||||
bpbase.clear() | ||||
for bp, bs in bpbase.iteritems(): # calculate roots | ||||
roots += list(repo.revs('children(%d) & ancestors(%ld)', bp, bs)) | ||||
rebaseset = repo.revs('%ld::', roots) | ||||
|
r28136 | |||
if not rebaseset: | ||||
# transform to list because smartsets are not comparable to | ||||
# lists. This should be improved to honor laziness of | ||||
# smartset. | ||||
if list(base) == [dest.rev()]: | ||||
if basef: | ||||
ui.status(_('nothing to rebase - %s is both "base"' | ||||
' and destination\n') % dest) | ||||
else: | ||||
ui.status(_('nothing to rebase - working directory ' | ||||
'parent is also destination\n')) | ||||
elif not repo.revs('%ld - ::%d', base, dest): | ||||
if basef: | ||||
ui.status(_('nothing to rebase - "base" %s is ' | ||||
'already an ancestor of destination ' | ||||
'%s\n') % | ||||
('+'.join(str(repo[r]) for r in base), | ||||
dest)) | ||||
else: | ||||
ui.status(_('nothing to rebase - working ' | ||||
'directory parent is already an ' | ||||
'ancestor of destination %s\n') % dest) | ||||
else: # can it happen? | ||||
ui.status(_('nothing to rebase from %s to %s\n') % | ||||
('+'.join(str(repo[r]) for r in base), dest)) | ||||
return None, None | ||||
|
r28189 | |||
if not destf: | ||||
|
r29043 | dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | ||
|
r28189 | destf = str(dest) | ||
|
r28136 | return dest, rebaseset | ||
|
r32248 | def externalparent(repo, state, destancestors): | ||
|
r19955 | """Return the revision that should be used as the second parent | ||
|
r32248 | when the revisions in state is collapsed on top of destancestors. | ||
|
r19955 | Abort if there is more than one parent. | ||
|
r10351 | """ | ||
|
r19955 | parents = set() | ||
|
r10351 | source = min(state) | ||
for rev in state: | ||||
if rev == source: | ||||
continue | ||||
for p in repo[rev].parents(): | ||||
if (p.rev() not in state | ||||
|
r32248 | and p.rev() not in destancestors): | ||
|
r19955 | parents.add(p.rev()) | ||
if not parents: | ||||
return nullrev | ||||
if len(parents) == 1: | ||||
return parents.pop() | ||||
|
r26587 | raise error.Abort(_('unable to collapse on top of %s, there is more ' | ||
|
r19956 | 'than one external parent: %s') % | ||
|
r32248 | (max(destancestors), | ||
|
r19956 | ', '.join(str(p) for p in sorted(parents)))) | ||
|
r10351 | |||
|
r26360 | def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, | ||
|
r26868 | keepbranches=False, date=None): | ||
|
r23484 | '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev | ||
but also store useful information in extra. | ||||
|
r23459 | Return node of committed revision.''' | ||
|
r33621 | dsguard = util.nullcontextmanager() | ||
if not repo.ui.configbool('rebase', 'singletransaction'): | ||||
dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||||
with dsguard: | ||||
r33135 | repo.setparents(repo[p1].node(), repo[p2].node()) | |||
ctx = repo[rev] | ||||
if commitmsg is None: | ||||
commitmsg = ctx.description() | ||||
keepbranch = keepbranches and repo[p1].branch() != ctx.branch() | ||||
extra = {'rebase_source': ctx.hex()} | ||||
if extrafn: | ||||
extrafn(ctx, extra) | ||||
|
r22038 | |||
|
r33140 | destphase = max(ctx.phase(), phases.draft) | ||
overrides = {('phases', 'new-commit'): destphase} | ||||
r33135 | with repo.ui.configoverride(overrides, 'rebase'): | |||
if keepbranch: | ||||
repo.ui.setconfig('ui', 'allowemptycommit', True) | ||||
# Commit might fail if unresolved files exist | ||||
if date is None: | ||||
date = ctx.date() | ||||
newnode = repo.commit(text=commitmsg, user=ctx.user(), | ||||
date=date, extra=extra, editor=editor) | ||||
|
r22038 | |||
r33135 | repo.dirstate.setbranch(repo[newnode].branch()) | |||
return newnode | ||||
|
r6906 | |||
|
r32248 | def rebasenode(repo, rev, p1, base, state, collapse, dest): | ||
|
r23484 | 'Rebase a single revision rev on top of p1 using base as merge ancestor' | ||
|
r6906 | # Merge phase | ||
|
r32248 | # Update to destination and merge it with local | ||
|
r23461 | if repo['.'].rev() != p1: | ||
repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | ||||
|
r30271 | mergemod.update(repo, p1, False, True) | ||
|
r6906 | else: | ||
|
r32249 | repo.ui.debug(" already in destination\n") | ||
|
r26748 | repo.dirstate.write(repo.currenttransaction()) | ||
|
r23461 | repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) | ||
|
r19969 | if base is not None: | ||
|
r23461 | repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) | ||
|
r16696 | # When collapsing in-place, the parent is the common ancestor, we | ||
# have to allow merging with it. | ||||
|
r30271 | stats = mergemod.update(repo, rev, True, True, base, collapse, | ||
labels=['dest', 'source']) | ||||
|
r22905 | if collapse: | ||
|
r32248 | copies.duplicatecopies(repo, rev, dest) | ||
|
r22905 | else: | ||
# If we're not using --collapse, we need to | ||||
# duplicate copies between the revision we're | ||||
# rebasing and its first parent, but *not* | ||||
# duplicate any copies that have already been | ||||
# performed in the destination. | ||||
p1rev = repo[rev].p1().rev() | ||||
|
r32248 | copies.duplicatecopies(repo, rev, p1rev, skiprev=dest) | ||
|
r22905 | return stats | ||
|
r6923 | |||
|
r33591 | def adjustdest(repo, rev, dest, state): | ||
"""adjust rebase destination given the current rebase state | ||||
rev is what is being rebased. Return a list of two revs, which are the | ||||
adjusted destinations for rev's p1 and p2, respectively. If a parent is | ||||
nullrev, return dest without adjustment for it. | ||||
For example, when doing rebase -r B+E -d F, rebase will first move B to B1, | ||||
and E's destination will be adjusted from F to B1. | ||||
B1 <- written during rebasing B | ||||
| | ||||
F <- original destination of B, E | ||||
| | ||||
| E <- rev, which is being rebased | ||||
| | | ||||
| D <- prev, one parent of rev being checked | ||||
| | | ||||
| x <- skipped, ex. no successor or successor in (::dest) | ||||
| | | ||||
| C | ||||
| | | ||||
| B <- rebased as B1 | ||||
|/ | ||||
A | ||||
Another example about merge changeset, rebase -r C+G+H -d K, rebase will | ||||
first move C to C1, G to G1, and when it's checking H, the adjusted | ||||
destinations will be [C1, G1]. | ||||
H C1 G1 | ||||
/| | / | ||||
F G |/ | ||||
K | | -> K | ||||
| C D | | ||||
| |/ | | ||||
| B | ... | ||||
|/ |/ | ||||
A A | ||||
""" | ||||
result = [] | ||||
for prev in repo.changelog.parentrevs(rev): | ||||
adjusted = dest | ||||
if prev != nullrev: | ||||
# pick already rebased revs from state | ||||
source = [s for s, d in state.items() if d > 0] | ||||
candidate = repo.revs('max(%ld and (::%d))', source, prev).first() | ||||
if candidate is not None: | ||||
adjusted = state[candidate] | ||||
result.append(adjusted) | ||||
return result | ||||
|
r18447 | def nearestrebased(repo, rev, state): | ||
"""return the nearest ancestors of rev in the rebase result""" | ||||
rebased = [r for r in state if state[r] > nullmerge] | ||||
candidates = repo.revs('max(%ld and (::%d))', rebased, rev) | ||||
if candidates: | ||||
|
r22820 | return state[candidates.first()] | ||
|
r18447 | else: | ||
return None | ||||
|
r30674 | def _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs, rebaseobsskipped): | ||
|
r28685 | """ | ||
Abort if rebase will create divergence or rebase is noop because of markers | ||||
`rebaseobsrevs`: set of obsolete revision in source | ||||
`rebasesetrevs`: set of revisions to be rebased from source | ||||
`rebaseobsskipped`: set of revisions from source skipped because they have | ||||
successors in destination | ||||
""" | ||||
# Obsolete node with successors not in dest leads to divergence | ||||
divergenceok = ui.configbool('experimental', | ||||
'allowdivergence') | ||||
divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | ||||
if divergencebasecandidates and not divergenceok: | ||||
divhashes = (str(repo[r]) | ||||
for r in divergencebasecandidates) | ||||
msg = _("this rebase will cause " | ||||
"divergences from: %s") | ||||
h = _("to force the rebase please set " | ||||
"experimental.allowdivergence=True") | ||||
raise error.Abort(msg % (",".join(divhashes),), hint=h) | ||||
|
r32248 | def defineparents(repo, rev, dest, state, destancestors, | ||
|
r29063 | obsoletenotrebased): | ||
|
r6906 | 'Return the new parent relationship of the revision that will be rebased' | ||
parents = repo[rev].parents() | ||||
p1 = p2 = nullrev | ||||
|
r29063 | rp1 = None | ||
|
r6906 | |||
|
r22906 | p1n = parents[0].rev() | ||
|
r32248 | if p1n in destancestors: | ||
p1 = dest | ||||
|
r22906 | elif p1n in state: | ||
if state[p1n] == nullmerge: | ||||
|
r32248 | p1 = dest | ||
|
r27014 | elif state[p1n] in revskipped: | ||
|
r22906 | p1 = nearestrebased(repo, p1n, state) | ||
|
r18447 | if p1 is None: | ||
|
r32248 | p1 = dest | ||
|
r10352 | else: | ||
|
r22906 | p1 = state[p1n] | ||
else: # p1n external | ||||
|
r32248 | p1 = dest | ||
|
r22906 | p2 = p1n | ||
|
r6906 | |||
|
r32248 | if len(parents) == 2 and parents[1].rev() not in destancestors: | ||
|
r22906 | p2n = parents[1].rev() | ||
|
r6906 | # interesting second parent | ||
|
r22906 | if p2n in state: | ||
|
r32248 | if p1 == dest: # p1n in destancestors or external | ||
|
r22906 | p1 = state[p2n] | ||
|
r29063 | if p1 == revprecursor: | ||
rp1 = obsoletenotrebased[p2n] | ||||
|
r27014 | elif state[p2n] in revskipped: | ||
|
r22906 | p2 = nearestrebased(repo, p2n, state) | ||
|
r18447 | if p2 is None: | ||
# no ancestors rebased yet, detach | ||||
|
r32248 | p2 = dest | ||
|
r6906 | else: | ||
|
r22906 | p2 = state[p2n] | ||
else: # p2n external | ||||
if p2 != nullrev: # p1n external too => rev is a merged revision | ||||
|
r26587 | raise error.Abort(_('cannot use revision %d as base, result ' | ||
|
r6906 | 'would have 3 parents') % rev) | ||
|
r22906 | p2 = p2n | ||
|
r10351 | repo.ui.debug(" future parents are %d and %d\n" % | ||
|
r29063 | (repo[rp1 or p1].rev(), repo[p2].rev())) | ||
|
r23484 | |||
|
r27963 | if not any(p.rev() in state for p in parents): | ||
# Case (1) root changeset of a non-detaching rebase set. | ||||
|
r23484 | # Let the merge mechanism find the base itself. | ||
base = None | ||||
elif not repo[rev].p2(): | ||||
# Case (2) detaching the node with a single parent, use this parent | ||||
base = repo[rev].p1().rev() | ||||
else: | ||||
|
r23732 | # Assuming there is a p1, this is the case where there also is a p2. | ||
# We are thus rebasing a merge and need to pick the right merge base. | ||||
|
r23484 | # | ||
# Imagine we have: | ||||
|
r23732 | # - M: current rebase revision in this step | ||
|
r23484 | # - A: one parent of M | ||
|
r23732 | # - B: other parent of M | ||
|
r23484 | # - D: destination of this merge step (p1 var) | ||
# | ||||
|
r23732 | # Consider the case where D is a descendant of A or B and the other is | ||
# 'outside'. In this case, the right merge base is the D ancestor. | ||||
# | ||||
# An informal proof, assuming A is 'outside' and B is the D ancestor: | ||||
|
r23484 | # | ||
# If we pick B as the base, the merge involves: | ||||
# - changes from B to M (actual changeset payload) | ||||
# - changes from B to D (induced by rebase) as D is a rebased | ||||
# version of B) | ||||
# Which exactly represent the rebase operation. | ||||
# | ||||
|
r23732 | # If we pick A as the base, the merge involves: | ||
|
r23484 | # - changes from A to M (actual changeset payload) | ||
# - changes from A to D (with include changes between unrelated A and B | ||||
# plus changes induced by rebase) | ||||
# Which does not represent anything sensible and creates a lot of | ||||
|
r23732 | # conflicts. A is thus not the right choice - B is. | ||
# | ||||
# Note: The base found in this 'proof' is only correct in the specified | ||||
# case. This base does not make sense if is not D a descendant of A or B | ||||
# or if the other is not parent 'outside' (especially not if the other | ||||
# parent has been rebased). The current implementation does not | ||||
# make it feasible to consider different cases separately. In these | ||||
# other cases we currently just leave it to the user to correctly | ||||
# resolve an impossible merge using a wrong ancestor. | ||||
|
r29063 | # | ||
# xx, p1 could be -4, and both parents could probably be -4... | ||||
|
r23484 | for p in repo[rev].parents(): | ||
if state.get(p.rev()) == p1: | ||||
base = p.rev() | ||||
break | ||||
else: # fallback when base not found | ||||
base = None | ||||
# Raise because this function is called wrong (see issue 4106) | ||||
raise AssertionError('no base found to rebase on ' | ||||
'(defineparents called wrong)') | ||||
|
r29063 | return rp1 or p1, p2, base | ||
|
r6906 | |||
|
r7955 | def isagitpatch(repo, patchname): | ||
'Return true if the given patch is in git format' | ||||
mqpatch = os.path.join(repo.mq.path, patchname) | ||||
for line in patch.linereader(file(mqpatch, 'rb')): | ||||
if line.startswith('diff --git'): | ||||
return True | ||||
return False | ||||
|
r6906 | def updatemq(repo, state, skipped, **opts): | ||
'Update rebased mq patches - finalize and then import them' | ||||
mqrebase = {} | ||||
|
r11537 | mq = repo.mq | ||
|
r14572 | original_series = mq.fullseries[:] | ||
|
r16531 | skippedpatches = set() | ||
|
r14497 | |||
|
r11537 | for p in mq.applied: | ||
rev = repo[p.node].rev() | ||||
if rev in state: | ||||
|
r9467 | repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' % | ||
|
r11537 | (rev, p.name)) | ||
mqrebase[rev] = (p.name, isagitpatch(repo, p.name)) | ||||
|
r16531 | else: | ||
# Applied but not rebased, not sure this should happen | ||||
skippedpatches.add(p.name) | ||||
|
r6906 | |||
if mqrebase: | ||||
|
r11537 | mq.finish(repo, mqrebase.keys()) | ||
|
r6906 | |||
# We must start import from the newest revision | ||||
|
r8210 | for rev in sorted(mqrebase, reverse=True): | ||
|
r6906 | if rev not in skipped: | ||
|
r11537 | name, isgit = mqrebase[rev] | ||
|
r23520 | repo.ui.note(_('updating mq patch %s to %s:%s\n') % | ||
(name, state[rev], repo[state[rev]])) | ||||
|
r11537 | mq.qimport(repo, (), patchname=name, git=isgit, | ||
rev=[str(state[rev])]) | ||||
|
r16531 | else: | ||
# Rebased and skipped | ||||
skippedpatches.add(mqrebase[rev][0]) | ||||
|
r14497 | |||
|
r16531 | # Patches were either applied and rebased and imported in | ||
# order, applied and removed or unapplied. Discard the removed | ||||
# ones while preserving the original series order and guards. | ||||
newseries = [s for s in original_series | ||||
if mq.guard_re.split(s, 1)[0] not in skippedpatches] | ||||
mq.fullseries[:] = newseries | ||||
mq.seriesdirty = True | ||||
|
r14580 | mq.savedirty() | ||
|
r6906 | |||
|
r28185 | def storecollapsemsg(repo, collapsemsg): | ||
'Store the collapse message to allow recovery' | ||||
collapsemsg = collapsemsg or '' | ||||
f = repo.vfs("last-message.txt", "w") | ||||
f.write("%s\n" % collapsemsg) | ||||
f.close() | ||||
def clearcollapsemsg(repo): | ||||
'Remove collapse message file' | ||||
|
r31311 | repo.vfs.unlinkpath("last-message.txt", ignoremissing=True) | ||
|
r28185 | |||
|
r31225 | def restorecollapsemsg(repo, isabort): | ||
|
r28185 | 'Restore previously stored collapse message' | ||
try: | ||||
f = repo.vfs("last-message.txt") | ||||
collapsemsg = f.readline().strip() | ||||
f.close() | ||||
except IOError as err: | ||||
if err.errno != errno.ENOENT: | ||||
raise | ||||
|
r31225 | if isabort: | ||
# Oh well, just abort like normal | ||||
collapsemsg = '' | ||||
else: | ||||
raise error.Abort(_('missing .hg/last-message.txt for rebase')) | ||||
|
r28185 | return collapsemsg | ||
|
r6906 | def clearstatus(repo): | ||
'Remove the status files' | ||||
|
r23970 | _clearrebasesetvisibiliy(repo) | ||
|
r33056 | # Make sure the active transaction won't write the state file | ||
tr = repo.currenttransaction() | ||||
if tr: | ||||
tr.removefilegenerator('rebasestate') | ||||
|
r31311 | repo.vfs.unlinkpath("rebasestate", ignoremissing=True) | ||
|
r6906 | |||
|
r25070 | def needupdate(repo, state): | ||
'''check whether we should `update --clean` away from a merge, or if | ||||
somehow the working dir got forcibly updated, e.g. by older hg''' | ||||
|
r27167 | parents = [p.rev() for p in repo[None].parents()] | ||
|
r25070 | |||
# Are we in a merge state at all? | ||||
if len(parents) < 2: | ||||
return False | ||||
# We should be standing on the first as-of-yet unrebased commit. | ||||
firstunrebased = min([old for old, new in state.iteritems() | ||||
if new == nullrev]) | ||||
if firstunrebased in parents: | ||||
|
r19516 | return True | ||
return False | ||||
|
r32248 | def abort(repo, originalwd, dest, state, activebookmark=None): | ||
|
r24758 | '''Restore the repository to its original state. Additional args: | ||
activebookmark: the name of the bookmark that should be active after the | ||||
restore''' | ||||
|
r26677 | |||
|
r26744 | try: | ||
# If the first commits in the rebased set get skipped during the rebase, | ||||
|
r32248 | # their values within the state mapping will be the dest rev id. The | ||
# dstates list must must not contain the dest rev (issue4896) | ||||
dstates = [s for s in state.values() if s >= 0 and s != dest] | ||||
|
r26744 | immutable = [d for d in dstates if not repo[d].mutable()] | ||
cleanup = True | ||||
if immutable: | ||||
repo.ui.warn(_("warning: can't clean up public changesets %s\n") | ||||
% ', '.join(str(repo[r]) for r in immutable), | ||||
|
r29966 | hint=_("see 'hg help phases' for details")) | ||
|
r26744 | cleanup = False | ||
|
r16280 | |||
|
r26744 | descendants = set() | ||
if dstates: | ||||
descendants = set(repo.changelog.descendants(dstates)) | ||||
if descendants - set(dstates): | ||||
|
r32249 | repo.ui.warn(_("warning: new changesets detected on destination " | ||
"branch, can't strip\n")) | ||||
|
r26744 | cleanup = False | ||
|
r19518 | |||
|
r26744 | if cleanup: | ||
|
r27988 | shouldupdate = False | ||
|
r32248 | rebased = filter(lambda x: x >= 0 and x != dest, state.values()) | ||
|
r27988 | if rebased: | ||
strippoints = [ | ||||
c.node() for c in repo.set('roots(%ld)', rebased)] | ||||
|
r31222 | |||
updateifonnodes = set(rebased) | ||||
|
r32248 | updateifonnodes.add(dest) | ||
|
r31222 | updateifonnodes.add(originalwd) | ||
shouldupdate = repo['.'].rev() in updateifonnodes | ||||
|
r27988 | |||
|
r26744 | # Update away from the rebase if necessary | ||
|
r27988 | if shouldupdate or needupdate(repo, state): | ||
|
r30271 | mergemod.update(repo, originalwd, False, True) | ||
|
r19516 | |||
|
r26744 | # Strip from the first rebased revision | ||
if rebased: | ||||
# no backup of rebased cset versions needed | ||||
repair.strip(repo.ui, repo, strippoints) | ||||
|
r19518 | |||
|
r26744 | if activebookmark and activebookmark in repo._bookmarks: | ||
bookmarks.activate(repo, activebookmark) | ||||
|
r24758 | |||
|
r26744 | finally: | ||
clearstatus(repo) | ||||
|
r28185 | clearcollapsemsg(repo) | ||
|
r26744 | repo.ui.warn(_('rebase aborted\n')) | ||
|
r19518 | return 0 | ||
|
r6906 | |||
|
r26349 | def buildstate(repo, dest, rebaseset, collapse, obsoletenotrebased): | ||
|
r15267 | '''Define which revisions are going to be rebased and where | ||
|
r6906 | |||
|
r15267 | repo: repo | ||
dest: context | ||||
rebaseset: set of rev | ||||
|
r17005 | ''' | ||
|
r31297 | originalwd = repo['.'].rev() | ||
|
r32291 | _setrebasesetvisibility(repo, set(rebaseset) | {originalwd}) | ||
|
r6906 | |||
|
r10672 | # This check isn't strictly necessary, since mq detects commits over an | ||
# applied patch. But it prevents messing up the working directory when | ||||
# a partially completed rebase is blocked by mq. | ||||
|
r15267 | if 'qtip' in repo.tags() and (dest.node() in | ||
|
r10678 | [s.node for s in repo.mq.applied]): | ||
|
r26587 | raise error.Abort(_('cannot rebase onto an applied mq patch')) | ||
|
r10672 | |||
|
r15267 | roots = list(repo.set('roots(%ld)', rebaseset)) | ||
if not roots: | ||||
|
r26587 | raise error.Abort(_('no matching revisions')) | ||
|
r18424 | roots.sort() | ||
|
r32175 | state = dict.fromkeys(rebaseset, revtodo) | ||
|
r18424 | detachset = set() | ||
|
r32272 | emptyrebase = True | ||
|
r18424 | for root in roots: | ||
commonbase = root.ancestor(dest) | ||||
if commonbase == root: | ||||
|
r26587 | raise error.Abort(_('source is ancestor of destination')) | ||
|
r18424 | if commonbase == dest: | ||
|
r31380 | wctx = repo[None] | ||
if dest == wctx.p1(): | ||||
# when rebasing to '.', it will use the current wd branch name | ||||
samebranch = root.branch() == wctx.branch() | ||||
else: | ||||
samebranch = root.branch() == dest.branch() | ||||
|
r32900 | if not collapse and samebranch and dest in root.parents(): | ||
|
r32272 | # mark the revision as done by setting its new revision | ||
# equal to its old (current) revisions | ||||
state[root.rev()] = root.rev() | ||||
|
r18424 | repo.ui.debug('source is a child of destination\n') | ||
|
r32272 | continue | ||
|
r6906 | |||
|
r32272 | emptyrebase = False | ||
|
r29936 | repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root)) | ||
|
r18424 | # Rebase tries to turn <dest> into a parent of <root> while | ||
# preserving the number of parents of rebased changesets: | ||||
# | ||||
# - A changeset with a single parent will always be rebased as a | ||||
# changeset with a single parent. | ||||
# | ||||
# - A merge will be rebased as merge unless its parents are both | ||||
# ancestors of <dest> or are themselves in the rebased set and | ||||
# pruned while rebased. | ||||
# | ||||
# If one parent of <root> is an ancestor of <dest>, the rebased | ||||
# version of this parent will be <dest>. This is always true with | ||||
# --base option. | ||||
# | ||||
# Otherwise, we need to *replace* the original parents with | ||||
# <dest>. This "detaches" the rebased set from its former location | ||||
# and rebases it onto <dest>. Changes introduced by ancestors of | ||||
# <root> not common with <dest> (the detachset, marked as | ||||
# nullmerge) are "removed" from the rebased changesets. | ||||
# | ||||
# - If <root> has a single parent, set it to <dest>. | ||||
# | ||||
# - If <root> is a merge, we cannot decide which parent to | ||||
# replace, the rebase operation is not clearly defined. | ||||
# | ||||
# The table below sums up this behavior: | ||||
# | ||||
# +------------------+----------------------+-------------------------+ | ||||
# | | one parent | merge | | ||||
# +------------------+----------------------+-------------------------+ | ||||
# | parent in | new parent is <dest> | parents in ::<dest> are | | ||||
# | ::<dest> | | remapped to <dest> | | ||||
# +------------------+----------------------+-------------------------+ | ||||
# | unrelated source | new parent is <dest> | ambiguous, abort | | ||||
# +------------------+----------------------+-------------------------+ | ||||
# | ||||
# The actual abort is handled by `defineparents` | ||||
if len(root.parents()) <= 1: | ||||
# ancestors of <root> not ancestors of <dest> | ||||
detachset.update(repo.changelog.findmissingrevs([commonbase.rev()], | ||||
[root.rev()])) | ||||
|
r32272 | if emptyrebase: | ||
return None | ||||
for rev in sorted(state): | ||||
parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev] | ||||
# if all parents of this revision are done, then so is this revision | ||||
if parents and all((state.get(p) == p for p in parents)): | ||||
state[rev] = rev | ||||
|
r18424 | for r in detachset: | ||
if r not in state: | ||||
state[r] = nullmerge | ||||
|
r18447 | if len(roots) > 1: | ||
# If we have multiple roots, we may have "hole" in the rebase set. | ||||
# Rebase roots that descend from those "hole" should not be detached as | ||||
# other root are. We use the special `revignored` to inform rebase that | ||||
|
r18644 | # the revision should be ignored but that `defineparents` should search | ||
# a rebase destination that make sense regarding rebased topology. | ||||
|
r18447 | rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset)) | ||
for ignored in set(rebasedomain) - set(rebaseset): | ||||
state[ignored] = revignored | ||||
|
r26349 | for r in obsoletenotrebased: | ||
|
r27012 | if obsoletenotrebased[r] is None: | ||
state[r] = revpruned | ||||
else: | ||||
state[r] = revprecursor | ||||
|
r31297 | return originalwd, dest.rev(), state | ||
|
r6906 | |||
|
r33591 | def clearrebased(ui, repo, dest, state, skipped, collapsedas=None): | ||
|
r17613 | """dispose of rebased revision at the end of the rebase | ||
If `collapsedas` is not None, the rebase was a collapse whose result if the | ||||
`collapsedas` node.""" | ||||
|
r33332 | tonode = repo.changelog.node | ||
|
r33591 | # Move bookmark of skipped nodes to destination. This cannot be handled | ||
# by scmutil.cleanupnodes since it will treat rev as removed (no successor) | ||||
# and move bookmark backwards. | ||||
bmchanges = [(name, tonode(max(adjustdest(repo, rev, dest, state)))) | ||||
for rev in skipped | ||||
for name in repo.nodebookmarks(tonode(rev))] | ||||
if bmchanges: | ||||
with repo.transaction('rebase') as tr: | ||||
repo._bookmarks.applychanges(repo, tr, bmchanges) | ||||
|
r33332 | mapping = {} | ||
|
r33333 | for rev, newrev in sorted(state.items()): | ||
if newrev >= 0 and newrev != rev: | ||||
if rev in skipped: | ||||
succs = () | ||||
elif collapsedas is not None: | ||||
succs = (collapsedas,) | ||||
else: | ||||
succs = (tonode(newrev),) | ||||
mapping[tonode(rev)] = succs | ||||
scmutil.cleanupnodes(repo, mapping, 'rebase') | ||||
|
r17611 | |||
|
r7216 | def pullrebase(orig, ui, repo, *args, **opts): | ||
|
r6906 | 'Call rebase after pull if the latter has been invoked with --rebase' | ||
|
r26960 | ret = None | ||
|
r6906 | if opts.get('rebase'): | ||
|
r31733 | if ui.configbool('commands', 'rebase.requiredest'): | ||
msg = _('rebase destination required by configuration') | ||||
hint = _('use hg pull followed by hg rebase -d DEST') | ||||
raise error.Abort(msg, hint=hint) | ||||
|
r32918 | with repo.wlock(), repo.lock(): | ||
|
r26029 | if opts.get('update'): | ||
del opts['update'] | ||||
ui.debug('--update and --rebase are not compatible, ignoring ' | ||||
'the update flag\n') | ||||
|
r6906 | |||
|
r30725 | cmdutil.checkunfinished(repo) | ||
|
r30755 | cmdutil.bailifchanged(repo, hint=_('cannot pull with rebase: ' | ||
'please commit or shelve your changes first')) | ||||
|
r30725 | |||
|
r26029 | revsprepull = len(repo) | ||
origpostincoming = commands.postincoming | ||||
def _dummy(*args, **kwargs): | ||||
pass | ||||
commands.postincoming = _dummy | ||||
try: | ||||
|
r26960 | ret = orig(ui, repo, *args, **opts) | ||
|
r26029 | finally: | ||
commands.postincoming = origpostincoming | ||||
revspostpull = len(repo) | ||||
if revspostpull > revsprepull: | ||||
# --rev option from pull conflict with rebase own --rev | ||||
# dropping it | ||||
if 'rev' in opts: | ||||
del opts['rev'] | ||||
# positional argument from pull conflicts with rebase's own | ||||
# --source. | ||||
if 'source' in opts: | ||||
del opts['source'] | ||||
|
r29044 | # revsprepull is the len of the repo, not revnum of tip. | ||
destspace = list(repo.changelog.revs(start=revsprepull)) | ||||
opts['_destspace'] = destspace | ||||
|
r28189 | try: | ||
rebase(ui, repo, **opts) | ||||
except error.NoMergeDestAbort: | ||||
# we can maybe update instead | ||||
|
r28118 | rev, _a, _b = destutil.destupdate(repo) | ||
|
r28189 | if rev == repo['.'].rev(): | ||
ui.status(_('nothing to rebase\n')) | ||||
else: | ||||
ui.status(_('nothing to rebase - updating instead\n')) | ||||
|
r28118 | # not passing argument to get the bare update behavior | ||
# with warning and trumpets | ||||
commands.update(ui, repo) | ||||
|
r6906 | else: | ||
|
r14444 | if opts.get('tool'): | ||
|
r26587 | raise error.Abort(_('--tool can only be used with --rebase')) | ||
|
r26960 | ret = orig(ui, repo, *args, **opts) | ||
return ret | ||||
|
r6906 | |||
|
r23970 | def _setrebasesetvisibility(repo, revs): | ||
"""store the currently rebased set on the repo object | ||||
This is used by another function to prevent rebased revision to because | ||||
|
r30865 | hidden (see issue4504)""" | ||
|
r23970 | repo = repo.unfiltered() | ||
repo._rebaseset = revs | ||||
# invalidate cache if visibility changes | ||||
hiddens = repo.filteredrevcache.get('visible', set()) | ||||
if revs & hiddens: | ||||
repo.invalidatevolatilesets() | ||||
def _clearrebasesetvisibiliy(repo): | ||||
"""remove rebaseset data from the repo""" | ||||
repo = repo.unfiltered() | ||||
if '_rebaseset' in vars(repo): | ||||
del repo._rebaseset | ||||
def _rebasedvisible(orig, repo): | ||||
|
r30865 | """ensure rebased revs stay visible (see issue4504)""" | ||
|
r23970 | blockers = orig(repo) | ||
blockers.update(getattr(repo, '_rebaseset', ())) | ||||
return blockers | ||||
|
r27790 | def _filterobsoleterevs(repo, revs): | ||
"""returns a set of the obsolete revisions in revs""" | ||||
return set(r for r in revs if repo[r].obsolete()) | ||||
|
r27744 | def _computeobsoletenotrebased(repo, rebaseobsrevs, dest): | ||
|
r26349 | """return a mapping obsolete => successor for all obsolete nodes to be | ||
|
r27012 | rebased that have a successors in the destination | ||
|
r30332 | obsolete => None entries in the mapping indicate nodes with no successor""" | ||
|
r26349 | obsoletenotrebased = {} | ||
|
r26781 | # Build a mapping successor => obsolete nodes for the obsolete | ||
|
r26349 | # nodes to be rebased | ||
allsuccessors = {} | ||||
|
r26674 | cl = repo.changelog | ||
|
r27744 | for r in rebaseobsrevs: | ||
node = cl.node(r) | ||||
r33146 | for s in obsutil.allsuccessors(repo.obsstore, [node]): | |||
|
r27744 | try: | ||
allsuccessors[cl.rev(s)] = cl.rev(node) | ||||
except LookupError: | ||||
pass | ||||
|
r26349 | |||
if allsuccessors: | ||||
# Look for successors of obsolete nodes to be rebased among | ||||
# the ancestors of dest | ||||
|
r33158 | ancs = cl.ancestors([dest], | ||
|
r26674 | stoprev=min(allsuccessors), | ||
inclusive=True) | ||||
|
r26349 | for s in allsuccessors: | ||
if s in ancs: | ||||
obsoletenotrebased[allsuccessors[s]] = s | ||||
|
r27012 | elif (s == allsuccessors[s] and | ||
allsuccessors.values().count(s) == 1): | ||||
# plain prune | ||||
obsoletenotrebased[s] = None | ||||
|
r26349 | return obsoletenotrebased | ||
|
r19214 | def summaryhook(ui, repo): | ||
|
r30709 | if not repo.vfs.exists('rebasestate'): | ||
|
r19214 | return | ||
|
r19849 | try: | ||
|
r29403 | rbsrt = rebaseruntime(repo, ui, {}) | ||
rbsrt.restorestatus() | ||||
state = rbsrt.state | ||||
|
r19849 | except error.RepoLookupError: | ||
# i18n: column positioning for "hg summary" | ||||
msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n') | ||||
ui.write(msg) | ||||
return | ||||
|
r23489 | numrebased = len([i for i in state.itervalues() if i >= 0]) | ||
|
r19214 | # i18n: column positioning for "hg summary" | ||
ui.write(_('rebase: %s, %s (rebase --continue)\n') % | ||||
(ui.label(_('%d rebased'), 'rebase.rebased') % numrebased, | ||||
ui.label(_('%d remaining'), 'rebase.remaining') % | ||||
(len(state) - numrebased))) | ||||
|
r6906 | def uisetup(ui): | ||
|
r23970 | #Replace pull with a decorator to provide --rebase option | ||
|
r7216 | entry = extensions.wrapcommand(commands.table, 'pull', pullrebase) | ||
entry[1].append(('', 'rebase', None, | ||||
|
r14444 | _("rebase working directory to branch head"))) | ||
entry[1].append(('t', 'tool', '', | ||||
_("specify merge tool for rebase"))) | ||||
|
r19214 | cmdutil.summaryhooks.add('rebase', summaryhook) | ||
|
r19478 | cmdutil.unfinishedstates.append( | ||
|
r19496 | ['rebasestate', False, False, _('rebase in progress'), | ||
|
r19478 | _("use 'hg rebase --continue' or 'hg rebase --abort'")]) | ||
|
r27626 | cmdutil.afterresolvedstates.append( | ||
['rebasestate', _('hg rebase --continue')]) | ||||
|
r23970 | # ensure rebased rev are not hidden | ||
|
r32580 | extensions.wrapfunction(repoview, 'pinnedrevs', _rebasedvisible) | ||