rebase.py
1956 lines
| 77.9 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 ( | ||||
nullrev, | ||||
short, | ||||
) | ||||
|
r29128 | from mercurial import ( | ||
bookmarks, | ||||
cmdutil, | ||||
commands, | ||||
copies, | ||||
destutil, | ||||
|
r30490 | dirstateguard, | ||
|
r29128 | error, | ||
extensions, | ||||
hg, | ||||
|
r30271 | merge as mergemod, | ||
|
r30495 | mergeutil, | ||
|
r29128 | obsolete, | ||
r33146 | obsutil, | |||
|
r29128 | patch, | ||
phases, | ||||
|
r35003 | pycompat, | ||
|
r29128 | registrar, | ||
repair, | ||||
revset, | ||||
|
r34007 | revsetlang, | ||
|
r29128 | scmutil, | ||
|
r31023 | smartset, | ||
|
r38535 | state as statemod, | ||
|
r29128 | util, | ||
) | ||||
|
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 | ||
|
r34006 | revtodostr = '-1' | ||
|
r33842 | |||
# legacy revstates no longer needed in current code | ||||
|
r33844 | # -2: nullmerge, -3: revignored, -4: revprecursor, -5: revpruned | ||
legacystates = {'-2', '-3', '-4', '-5'} | ||||
|
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() | ||||
|
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 | |||
|
r37805 | @revsetpredicate('_destautoorphanrebase') | ||
def _revsetdestautoorphanrebase(repo, subset, x): | ||||
|
r42485 | # ``_destautoorphanrebase()`` | ||
# automatic rebase destination for a single orphan revision. | ||||
|
r37805 | unfi = repo.unfiltered() | ||
obsoleted = unfi.revs('obsolete()') | ||||
src = revset.getset(repo, subset, x).first() | ||||
# Empty src or already obsoleted - Do not return a destination | ||||
if not src or src in obsoleted: | ||||
return smartset.baseset() | ||||
dests = destutil.orphanpossibledestination(repo, src) | ||||
if len(dests) > 1: | ||||
raise error.Abort( | ||||
_("ambiguous automatic rebase: %r could end up on any of %r") % ( | ||||
src, dests)) | ||||
# We have zero or one destination, so we can just return here. | ||||
return smartset.baseset(dests) | ||||
|
r33840 | def _ctxdesc(ctx): | ||
"""short description for a context""" | ||||
desc = '%d:%s "%s"' % (ctx.rev(), ctx, | ||||
ctx.description().split('\n', 1)[0]) | ||||
repo = ctx.repo() | ||||
|
r34291 | names = [] | ||
for nsname, ns in repo.names.iteritems(): | ||||
if nsname == 'branches': | ||||
continue | ||||
names.extend(ns.names(repo, ctx.node())) | ||||
|
r33840 | if names: | ||
desc += ' (%s)' % ' '.join(names) | ||||
return desc | ||||
|
r29358 | class rebaseruntime(object): | ||
"""This class is a container for rebase runtime state""" | ||||
|
r35389 | def __init__(self, repo, ui, inmemory=False, opts=None): | ||
|
r29399 | if opts is None: | ||
opts = {} | ||||
|
r34096 | # prepared: whether we have rebasestate prepared or not. Currently it | ||
# decides whether "self.repo" is unfiltered or not. | ||||
# The rebasestate has explicit hash to hash instructions not depending | ||||
# on visibility. If rebasestate exists (in-memory or on-disk), use | ||||
# unfiltered repo to avoid visibility issues. | ||||
# Before knowing rebasestate (i.e. when starting a new rebase (not | ||||
# --continue or --abort)), the original repo should be used so | ||||
# visibility-dependent revsets are correct. | ||||
self.prepared = False | ||||
self._repo = repo | ||||
|
r29399 | 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 | ||||
|
r34006 | self.destmap = {} | ||
|
r29360 | self.skipped = 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 | |||
|
r41242 | self.backupf = ui.configbool('rewrite', 'backup-bundle') | ||
|
r29402 | self.keepf = opts.get('keep', False) | ||
self.keepbranchesf = opts.get('keepbranches', False) | ||||
|
r29404 | self.obsoletenotrebased = {} | ||
|
r35049 | self.obsoletewithoutsuccessorindestination = set() | ||
|
r35389 | self.inmemory = inmemory | ||
|
r38535 | self.stateobj = statemod.cmdstate(repo, 'rebasestate') | ||
|
r29402 | |||
|
r34096 | @property | ||
def repo(self): | ||||
if self.prepared: | ||||
return self._repo.unfiltered() | ||||
else: | ||||
return self._repo | ||||
|
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): | ||||
|
r34097 | repo = self.repo | ||
assert repo.filtername is None | ||||
|
r31223 | f.write(repo[self.originalwd].hex() + '\n') | ||
|
r34006 | # was "dest". we now write dest per src root below. | ||
f.write('\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 '')) | ||||
|
r34006 | destmap = self.destmap | ||
|
r31223 | for d, v in self.state.iteritems(): | ||
oldrev = repo[d].hex() | ||||
if v >= 0: | ||||
newrev = repo[v].hex() | ||||
else: | ||||
|
r35933 | newrev = "%d" % v | ||
|
r34006 | destnode = repo[destmap[d]].hex() | ||
f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | ||||
|
r31223 | repo.ui.debug('rebase status stored\n') | ||
|
r29403 | def restorestatus(self): | ||
"""Restore a previously stored status""" | ||||
|
r38537 | if not self.stateobj.exists(): | ||
cmdutil.wrongtooltocontinue(self.repo, _('rebase')) | ||||
|
r38534 | data = self._read() | ||
self.repo.ui.debug('rebase status resumed\n') | ||||
self.originalwd = data['originalwd'] | ||||
self.destmap = data['destmap'] | ||||
self.state = data['state'] | ||||
self.skipped = data['skipped'] | ||||
self.collapsef = data['collapse'] | ||||
self.keepf = data['keep'] | ||||
self.keepbranchesf = data['keepbranches'] | ||||
self.external = data['external'] | ||||
self.activebookmark = data['activebookmark'] | ||||
def _read(self): | ||||
|
r34096 | self.prepared = True | ||
|
r29403 | repo = self.repo | ||
|
r34097 | assert repo.filtername is None | ||
|
r38534 | data = {'keepbranches': None, 'collapse': None, 'activebookmark': None, | ||
'external': nullrev, 'keep': None, 'originalwd': None} | ||||
|
r34006 | legacydest = None | ||
|
r29403 | state = {} | ||
|
r34006 | destmap = {} | ||
|
r29403 | |||
|
r38537 | if True: | ||
|
r29403 | f = repo.vfs("rebasestate") | ||
for i, l in enumerate(f.read().splitlines()): | ||||
if i == 0: | ||||
|
r38534 | data['originalwd'] = repo[l].rev() | ||
|
r29403 | elif i == 1: | ||
|
r34006 | # this line should be empty in newer version. but legacy | ||
# clients may still use it | ||||
if l: | ||||
legacydest = repo[l].rev() | ||||
|
r29403 | elif i == 2: | ||
|
r38534 | data['external'] = repo[l].rev() | ||
|
r29403 | elif i == 3: | ||
|
r38534 | data['collapse'] = bool(int(l)) | ||
|
r29403 | elif i == 4: | ||
|
r38534 | data['keep'] = bool(int(l)) | ||
|
r29403 | elif i == 5: | ||
|
r38534 | data['keepbranches'] = bool(int(l)) | ||
|
r29403 | 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 | ||||
|
r38534 | data['activebookmark'] = l | ||
|
r29403 | else: | ||
|
r34006 | args = l.split(':') | ||
|
r37395 | oldrev = repo[args[0]].rev() | ||
|
r34006 | newrev = args[1] | ||
|
r33842 | if newrev in legacystates: | ||
continue | ||||
|
r34006 | if len(args) > 2: | ||
|
r37394 | destrev = repo[args[2]].rev() | ||
|
r34006 | else: | ||
|
r37394 | destrev = legacydest | ||
|
r37395 | destmap[oldrev] = destrev | ||
|
r37396 | if newrev == revtodostr: | ||
|
r37395 | state[oldrev] = revtodo | ||
|
r29403 | # Legacy compat special case | ||
else: | ||||
|
r37395 | state[oldrev] = repo[newrev].rev() | ||
|
r29403 | |||
|
r38534 | if data['keepbranches'] is None: | ||
|
r29403 | raise error.Abort(_('.hg/rebasestate is incomplete')) | ||
|
r38534 | data['destmap'] = destmap | ||
data['state'] = state | ||||
|
r29403 | skipped = set() | ||
# recompute the set of skipped revs | ||||
|
r38534 | if not data['collapse']: | ||
|
r34006 | seen = set(destmap.values()) | ||
|
r29403 | for old, new in sorted(state.items()): | ||
if new != revtodo and new in seen: | ||||
skipped.add(old) | ||||
seen.add(new) | ||||
|
r38534 | data['skipped'] = skipped | ||
|
r29403 | repo.ui.debug('computed skipped revs: %s\n' % | ||
|
r36164 | (' '.join('%d' % r for r in sorted(skipped)) or '')) | ||
|
r29403 | |||
|
r38534 | return data | ||
|
r29403 | |||
|
r34006 | def _handleskippingobsolete(self, obsoleterevs, destmap): | ||
|
r29479 | """Compute structures necessary for skipping obsolete revisions | ||
obsoleterevs: iterable of all obsolete revisions in rebaseset | ||||
|
r34006 | destmap: {srcrev: destrev} destination revisions | ||
|
r29479 | """ | ||
self.obsoletenotrebased = {} | ||||
|
r34493 | if not self.ui.configbool('experimental', 'rebaseskipobsolete'): | ||
|
r29479 | return | ||
obsoleteset = set(obsoleterevs) | ||||
|
r36013 | (self.obsoletenotrebased, | ||
self.obsoletewithoutsuccessorindestination, | ||||
obsoleteextinctsuccessors) = _computeobsoletenotrebased( | ||||
self.repo, obsoleteset, destmap) | ||||
|
r29479 | skippedset = set(self.obsoletenotrebased) | ||
|
r35049 | skippedset.update(self.obsoletewithoutsuccessorindestination) | ||
|
r36013 | skippedset.update(obsoleteextinctsuccessors) | ||
|
r33845 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | ||
|
r29479 | |||
|
r38518 | def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False): | ||
|
r29472 | 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) | ||||
|
r38852 | |||
|
r29472 | if isabort: | ||
|
r38852 | backup = backup and self.backupf | ||
|
r40892 | return self._abort(backup=backup, suppwarns=suppwarns) | ||
|
r29472 | |||
|
r34006 | def _preparenewrebase(self, destmap): | ||
if not destmap: | ||||
|
r29473 | return _nothingtorebase() | ||
|
r34006 | rebaseset = destmap.keys() | ||
|
r29473 | 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')) | ||||
|
r34010 | result = buildstate(self.repo, destmap, self.collapsef) | ||
|
r29473 | |||
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 | |||
|
r34006 | (self.originalwd, self.destmap, self.state) = result | ||
|
r29473 | if self.collapsef: | ||
|
r34006 | dests = set(self.destmap.values()) | ||
if len(dests) != 1: | ||||
raise error.Abort( | ||||
_('--collapse does not work with multiple destinations')) | ||||
destrev = next(iter(dests)) | ||||
destancestors = self.repo.changelog.ancestors([destrev], | ||||
|
r33846 | inclusive=True) | ||
self.external = externalparent(self.repo, self.state, destancestors) | ||||
|
r29473 | |||
|
r34006 | for destrev in sorted(set(destmap.values())): | ||
dest = self.repo[destrev] | ||||
if dest.closesbranch() and not self.keepbranchesf: | ||||
self.ui.status(_('reopening closed branch head %s\n') % dest) | ||||
|
r29473 | |||
|
r34096 | self.prepared = True | ||
|
r29473 | |||
|
r35334 | def _assignworkingcopy(self): | ||
|
r35291 | if self.inmemory: | ||
from mercurial.context import overlayworkingctx | ||||
self.wctx = overlayworkingctx(self.repo) | ||||
|
r35385 | self.repo.ui.debug("rebasing in-memory\n") | ||
|
r35291 | else: | ||
self.wctx = self.repo[None] | ||||
|
r35385 | self.repo.ui.debug("rebasing on disk\n") | ||
|
r40686 | self.repo.ui.log("rebase", | ||
"using in-memory rebase: %r\n", self.inmemory, | ||||
rebase_imm_used=self.inmemory) | ||||
|
r35334 | |||
def _performrebase(self, tr): | ||||
self._assignworkingcopy() | ||||
repo, ui = self.repo, self.ui | ||||
|
r29477 | 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')) | ||||
|
r34010 | # Calculate self.obsoletenotrebased | ||
obsrevs = _filterobsoleterevs(self.repo, self.state) | ||||
self._handleskippingobsolete(obsrevs, self.destmap) | ||||
|
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() | ||||
|
r37049 | if tr: | ||
# When using single transaction, store state when transaction | ||||
# commits. | ||||
self.storestatus(tr) | ||||
|
r31225 | |||
|
r29872 | cands = [k for k, v in self.state.iteritems() if v == revtodo] | ||
|
r38396 | p = repo.ui.makeprogress(_("rebasing"), unit=_('changesets'), | ||
total=len(cands)) | ||||
|
r36951 | def progress(ctx): | ||
|
r38396 | p.increment(item=("%d:%s" % (ctx.rev(), ctx))) | ||
|
r36951 | allowdivergence = self.ui.configbool( | ||
'experimental', 'evolution.allowdivergence') | ||||
|
r34008 | for subset in sortsource(self.destmap): | ||
|
r36950 | sortedrevs = self.repo.revs('sort(%ld, -topo)', subset) | ||
if not allowdivergence: | ||||
sortedrevs -= self.repo.revs( | ||||
'descendants(%ld) and not %ld', | ||||
self.obsoletewithoutsuccessorindestination, | ||||
self.obsoletewithoutsuccessorindestination, | ||||
) | ||||
for rev in sortedrevs: | ||||
self._rebasenode(tr, rev, allowdivergence, progress) | ||||
|
r38396 | p.complete() | ||
|
r34008 | ui.note(_('rebase merging completed\n')) | ||
|
r37051 | def _concludenode(self, rev, p1, p2, editor, commitmsg=None): | ||
'''Commit the wd changes with parents p1 and p2. | ||||
Reuse commit info from rev but also store useful information in extra. | ||||
Return node of committed revision.''' | ||||
repo = self.repo | ||||
|
r37052 | ctx = repo[rev] | ||
|
r37053 | if commitmsg is None: | ||
commitmsg = ctx.description() | ||||
|
r37059 | date = self.date | ||
if date is None: | ||||
date = ctx.date() | ||||
|
r37054 | extra = {'rebase_source': ctx.hex()} | ||
|
r37055 | for c in self.extrafns: | ||
c(ctx, extra) | ||||
|
r37056 | keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch() | ||
|
r37057 | destphase = max(ctx.phase(), phases.draft) | ||
overrides = {('phases', 'new-commit'): destphase} | ||||
if keepbranch: | ||||
overrides[('ui', 'allowemptycommit')] = True | ||||
|
r37058 | with repo.ui.configoverride(overrides, 'rebase'): | ||
if self.inmemory: | ||||
|
r37061 | newnode = commitmemorynode(repo, p1, p2, | ||
|
r37058 | wctx=self.wctx, | ||
extra=extra, | ||||
commitmsg=commitmsg, | ||||
editor=editor, | ||||
|
r37060 | user=ctx.user(), | ||
|
r37059 | date=date) | ||
|
r37058 | mergemod.mergestate.clean(repo) | ||
else: | ||||
|
r37061 | newnode = commitnode(repo, p1, p2, | ||
|
r37058 | extra=extra, | ||
commitmsg=commitmsg, | ||||
editor=editor, | ||||
|
r37060 | user=ctx.user(), | ||
|
r37059 | date=date) | ||
|
r37051 | |||
|
r37058 | 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) | ||||
return newnode | ||||
|
r37051 | |||
|
r36949 | def _rebasenode(self, tr, rev, allowdivergence, progressfn): | ||
|
r34008 | repo, ui, opts = self.repo, self.ui, self.opts | ||
|
r36949 | dest = self.destmap[rev] | ||
ctx = repo[rev] | ||||
desc = _ctxdesc(ctx) | ||||
if self.state[rev] == rev: | ||||
ui.status(_('already rebased %s\n') % desc) | ||||
elif (not allowdivergence | ||||
and rev in self.obsoletewithoutsuccessorindestination): | ||||
msg = _('note: not rebasing %s and its descendants as ' | ||||
'this would cause divergence\n') % desc | ||||
repo.ui.status(msg) | ||||
self.skipped.add(rev) | ||||
elif rev in self.obsoletenotrebased: | ||||
succ = self.obsoletenotrebased[rev] | ||||
if succ is None: | ||||
msg = _('note: not rebasing %s, it has no ' | ||||
'successor\n') % desc | ||||
else: | ||||
succdesc = _ctxdesc(repo[succ]) | ||||
msg = (_('note: not rebasing %s, already in ' | ||||
'destination as %s\n') % (desc, succdesc)) | ||||
repo.ui.status(msg) | ||||
# Make clearrebased aware state[rev] is not a true successor | ||||
self.skipped.add(rev) | ||||
# Record rev as moved to its desired destination in self.state. | ||||
# This helps bookmark and working parent movement. | ||||
dest = max(adjustdest(repo, rev, self.destmap, self.state, | ||||
self.skipped)) | ||||
self.state[rev] = dest | ||||
elif self.state[rev] == revtodo: | ||||
ui.status(_('rebasing %s\n') % desc) | ||||
progressfn(ctx) | ||||
p1, p2, base = defineparents(repo, rev, self.destmap, | ||||
self.state, self.skipped, | ||||
self.obsoletenotrebased) | ||||
|
r40836 | if not self.inmemory and len(repo[None].parents()) == 2: | ||
|
r36949 | repo.ui.debug('resuming interrupted rebase\n') | ||
else: | ||||
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | ||||
with ui.configoverride(overrides, 'rebase'): | ||||
stats = rebasenode(repo, rev, p1, base, self.collapsef, | ||||
dest, wctx=self.wctx) | ||||
|
r37143 | if stats.unresolvedcount > 0: | ||
|
r37045 | if self.inmemory: | ||
|
r36949 | raise error.InMemoryMergeConflictsError() | ||
else: | ||||
raise error.InterventionRequired( | ||||
_('unresolved conflicts (see hg ' | ||||
'resolve, then hg rebase --continue)')) | ||||
if not self.collapsef: | ||||
merging = p2 != nullrev | ||||
editform = cmdutil.mergeeditform(merging, 'rebase') | ||||
editor = cmdutil.getcommiteditor(editform=editform, | ||||
**pycompat.strkwargs(opts)) | ||||
|
r37051 | newnode = self._concludenode(rev, p1, p2, editor) | ||
|
r36949 | else: | ||
# Skip commit if we are collapsing | ||||
|
r37045 | if self.inmemory: | ||
|
r36949 | self.wctx.setbase(repo[p1]) | ||
else: | ||||
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: | ||||
|
r29477 | if not self.collapsef: | ||
|
r40900 | ui.warn(_('note: not rebasing %s, its destination already ' | ||
'has all its changes\n') % desc) | ||||
|
r36949 | self.skipped.add(rev) | ||
self.state[rev] = p1 | ||||
ui.debug('next revision set to %d\n' % p1) | ||||
else: | ||||
ui.status(_('already rebased %s as %s\n') % | ||||
(desc, repo[self.state[rev]])) | ||||
|
r37050 | if not tr: | ||
# When not using single transaction, store state after each | ||||
# commit is completely done. On InterventionRequired, we thus | ||||
# won't store the status. Instead, we'll hit the "len(parents) == 2" | ||||
# case and realize that the commit was in progress. | ||||
self.storestatus() | ||||
|
r29477 | |||
|
r38852 | def _finishrebase(self): | ||
|
r29478 | repo, ui, opts = self.repo, self.ui, self.opts | ||
|
r34884 | fm = ui.formatter('rebase', opts) | ||
fm.startitem() | ||||
|
r36789 | if self.collapsef: | ||
|
r34006 | p1, p2, _base = defineparents(repo, min(self.state), self.destmap, | ||
|
r34010 | self.state, self.skipped, | ||
|
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): | ||
|
r33847 | if rebased not in self.skipped: | ||
|
r29478 | commitmsg += '\n* %s' % repo[rebased].description() | ||
editopt = True | ||||
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | ||||
|
r29552 | revtoreuse = max(self.state) | ||
|
r33621 | |||
|
r37051 | newnode = self._concludenode(revtoreuse, p1, self.external, | ||
editor, commitmsg=commitmsg) | ||||
|
r36946 | |||
|
r33864 | if newnode is not None: | ||
|
r29478 | newrev = repo[newnode].rev() | ||
|
r36313 | for oldrev in self.state: | ||
|
r29478 | self.state[oldrev] = newrev | ||
if 'qtip' in repo.tags(): | ||||
|
r36418 | updatemq(repo, self.state, self.skipped, | ||
**pycompat.strkwargs(opts)) | ||||
|
r29478 | |||
# restore original working directory | ||||
# (we do this before stripping) | ||||
newwd = self.state.get(self.originalwd, self.originalwd) | ||||
|
r33842 | if newwd < 0: | ||
|
r29478 | # original directory is a parent of rebase set root or ignored | ||
newwd = self.originalwd | ||||
|
r36993 | if newwd not in [c.rev() for c in repo[None].parents()]: | ||
|
r29478 | ui.note(_("update back to initial working directory parent\n")) | ||
|
r38527 | hg.updaterepo(repo, newwd, overwrite=False) | ||
|
r29478 | |||
|
r34364 | collapsedas = None | ||
|
r36792 | if self.collapsef and not self.keepf: | ||
collapsedas = newnode | ||||
|
r34366 | clearrebased(ui, repo, self.destmap, self.state, self.skipped, | ||
|
r38852 | collapsedas, self.keepf, fm=fm, backup=self.backupf) | ||
|
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) | ||||
|
r34884 | fm.end() | ||
|
r29478 | |||
|
r33332 | if (self.activebookmark and self.activebookmark in repo._bookmarks and | ||
|
r29478 | repo['.'].node() == repo._bookmarks[self.activebookmark]): | ||
bookmarks.activate(repo, self.activebookmark) | ||||
|
r40892 | def _abort(self, backup=True, suppwarns=False): | ||
'''Restore the repository to its original state.''' | ||||
|
r40891 | |||
|
r40892 | repo = self.repo | ||
|
r40891 | 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) | ||||
|
r40892 | rebased = [s for r, s in self.state.items() | ||
if s >= 0 and s != r and s != self.destmap[r]] | ||||
|
r40891 | 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) | ||||
|
r40892 | updateifonnodes.update(self.destmap.values()) | ||
updateifonnodes.add(self.originalwd) | ||||
|
r40891 | shouldupdate = repo['.'].rev() in updateifonnodes | ||
# Update away from the rebase if necessary | ||||
|
r40892 | if shouldupdate or needupdate(repo, self.state): | ||
mergemod.update(repo, self.originalwd, branchmerge=False, | ||||
|
r40891 | force=True) | ||
# Strip from the first rebased revision | ||||
if rebased: | ||||
repair.strip(repo.ui, repo, strippoints, backup=backup) | ||||
|
r40892 | if self.activebookmark and self.activebookmark in repo._bookmarks: | ||
bookmarks.activate(repo, self.activebookmark) | ||||
|
r40891 | |||
finally: | ||||
clearstatus(repo) | ||||
clearcollapsemsg(repo) | ||||
if not suppwarns: | ||||
repo.ui.warn(_('rebase aborted\n')) | ||||
return 0 | ||||
|
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')), | ||
|
r39128 | ('', 'stop', False, _('stop interrupted rebase')), | ||
|
r14306 | ('c', 'continue', False, _('continue an interrupted rebase')), | ||
|
r37805 | ('a', 'abort', False, _('abort an interrupted rebase')), | ||
('', 'auto-orphans', '', _('automatically rebase orphan revisions ' | ||||
'in the specified revset (EXPERIMENTAL)')), | ||||
|
r38689 | ] + cmdutil.dryrunopts + cmdutil.formatteropts + cmdutil.confirmopts, | ||
|
r40329 | _('[-s REV | -b REV] [-d REV] [OPTION]'), | ||
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | ||||
|
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 | |||
|
r41972 | 4. If you do not specify any of ``--rev``, ``--source``, or ``--base``, | ||
|
r27959 | rebase will use ``--base .`` as above. | ||
|
r27932 | |||
|
r35288 | If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC`` | ||
can be used in ``--dest``. Destination would be calculated per source | ||||
revision with ``SRC`` substituted by that single source revision and | ||||
``ALLSRC`` substituted by all source revisions. | ||||
|
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 | ||
|
r39130 | continued with --continue/-c, aborted with --abort/-a, or stopped with | ||
--stop. | ||||
|
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 | ||||
|
r35288 | - stabilize orphaned changesets so history looks linear:: | ||
hg rebase -r 'orphan()-obsolete()'\ | ||||
-d 'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) +\ | ||||
max(::((roots(ALLSRC) & ::SRC)^)-obsolete()))' | ||||
|
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 | ||||
|
r35389 | By default, rebase writes to the working copy, but you can configure it to | ||
run in-memory for for better performance, and to allow it to run if the | ||||
working copy is dirty:: | ||||
[rebase] | ||||
experimental.inmemory = True | ||||
|
r31558 | Return Values: | ||
|
r19971 | Returns 0 on success, 1 if nothing to rebase or there are | ||
unresolved conflicts. | ||||
|
r22790 | |||
|
r6906 | """ | ||
|
r38520 | opts = pycompat.byteskwargs(opts) | ||
|
r35389 | inmemory = ui.configbool('rebase', 'experimental.inmemory') | ||
|
r38520 | dryrun = opts.get('dry_run') | ||
|
r39133 | confirm = opts.get('confirm') | ||
|
r39134 | selactions = [k for k in ['abort', 'stop', 'continue'] if opts.get(k)] | ||
if len(selactions) > 1: | ||||
raise error.Abort(_('cannot use --%s with --%s') | ||||
% tuple(selactions[:2])) | ||||
|
r39135 | action = selactions[0] if selactions else None | ||
if dryrun and action: | ||||
raise error.Abort(_('cannot specify both --dry-run and --%s') % action) | ||||
if confirm and action: | ||||
raise error.Abort(_('cannot specify both --confirm and --%s') % action) | ||||
if dryrun and confirm: | ||||
raise error.Abort(_('cannot specify both --confirm and --dry-run')) | ||||
|
r38391 | |||
|
r39137 | if action or repo.currenttransaction() is not None: | ||
|
r35321 | # in-memory rebase is not compatible with resuming rebases. | ||
|
r35719 | # (Or if it is run within a transaction, since the restart logic can | ||
# fail the entire transaction.) | ||||
|
r35389 | inmemory = False | ||
|
r35321 | |||
|
r38520 | if opts.get('auto_orphans'): | ||
|
r37805 | for key in opts: | ||
|
r38520 | if key != 'auto_orphans' and opts.get(key): | ||
|
r37805 | raise error.Abort(_('--auto-orphans is incompatible with %s') % | ||
|
r38520 | ('--' + key)) | ||
userrevs = list(repo.revs(opts.get('auto_orphans'))) | ||||
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] | ||||
opts['dest'] = '_destautoorphanrebase(SRC)' | ||||
|
r37805 | |||
|
r39133 | if dryrun or confirm: | ||
|
r39136 | return _dryrunrebase(ui, repo, action, opts) | ||
elif action == 'stop': | ||||
|
r39128 | rbsrt = rebaseruntime(repo, ui) | ||
with repo.wlock(), repo.lock(): | ||||
|
r39152 | rbsrt.restorestatus() | ||
if rbsrt.collapsef: | ||||
raise error.Abort(_("cannot stop in --collapse session")) | ||||
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | ||||
if not (rbsrt.keepf or allowunstable): | ||||
raise error.Abort(_("cannot remove original changesets with" | ||||
" unrebased descendants"), | ||||
hint=_('either enable obsmarkers to allow unstable ' | ||||
'revisions or use --keep to keep original ' | ||||
'changesets')) | ||||
|
r39128 | if needupdate(repo, rbsrt.state): | ||
# update to the current working revision | ||||
# to clear interrupted merge | ||||
hg.updaterepo(repo, rbsrt.originalwd, overwrite=True) | ||||
rbsrt._finishrebase() | ||||
return 0 | ||||
|
r38391 | elif inmemory: | ||
|
r35321 | try: | ||
# in-memory merge doesn't support conflicts, so if we hit any, abort | ||||
# and re-run as an on-disk merge. | ||||
|
r37348 | overrides = {('rebase', 'singletransaction'): True} | ||
with ui.configoverride(overrides, 'rebase'): | ||||
|
r39136 | return _dorebase(ui, repo, action, opts, inmemory=inmemory) | ||
|
r35321 | except error.InMemoryMergeConflictsError: | ||
ui.warn(_('hit merge conflicts; re-running rebase without in-memory' | ||||
' merge\n')) | ||||
|
r40835 | # TODO: Make in-memory merge not use the on-disk merge state, so | ||
# we don't have to clean it here | ||||
mergemod.mergestate.clean(repo) | ||||
clearstatus(repo) | ||||
clearcollapsemsg(repo) | ||||
|
r39136 | return _dorebase(ui, repo, action, opts, inmemory=False) | ||
|
r35321 | else: | ||
|
r39136 | return _dorebase(ui, repo, action, opts) | ||
|
r35321 | |||
|
r39136 | def _dryrunrebase(ui, repo, action, opts): | ||
|
r38520 | rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) | ||
|
r38689 | confirm = opts.get('confirm') | ||
if confirm: | ||||
|
r38697 | ui.status(_('starting in-memory rebase\n')) | ||
|
r38689 | else: | ||
ui.status(_('starting dry-run rebase; repository will not be ' | ||||
'changed\n')) | ||||
|
r38515 | with repo.wlock(), repo.lock(): | ||
|
r38689 | needsabort = True | ||
|
r38515 | try: | ||
overrides = {('rebase', 'singletransaction'): True} | ||||
with ui.configoverride(overrides, 'rebase'): | ||||
|
r39136 | _origrebase(ui, repo, action, opts, rbsrt, inmemory=True, | ||
|
r38519 | leaveunfinished=True) | ||
|
r38515 | except error.InMemoryMergeConflictsError: | ||
ui.status(_('hit a merge conflict\n')) | ||||
return 1 | ||||
|
r42277 | except error.Abort: | ||
needsabort = False | ||||
raise | ||||
|
r38515 | else: | ||
|
r38689 | if confirm: | ||
ui.status(_('rebase completed successfully\n')) | ||||
if not ui.promptchoice(_(b'apply changes (yn)?' | ||||
b'$$ &Yes $$ &No')): | ||||
# finish unfinished rebase | ||||
|
r38852 | rbsrt._finishrebase() | ||
|
r38689 | else: | ||
rbsrt._prepareabortorcontinue(isabort=True, backup=False, | ||||
suppwarns=True) | ||||
needsabort = False | ||||
else: | ||||
ui.status(_('dry-run rebase completed successfully; run without' | ||||
' -n/--dry-run to perform this rebase\n')) | ||||
|
r38515 | return 0 | ||
finally: | ||||
|
r38689 | if needsabort: | ||
# no need to store backup in case of dryrun | ||||
rbsrt._prepareabortorcontinue(isabort=True, backup=False, | ||||
suppwarns=True) | ||||
|
r38515 | |||
|
r39136 | def _dorebase(ui, repo, action, opts, inmemory=False): | ||
|
r38520 | rbsrt = rebaseruntime(repo, ui, inmemory, opts) | ||
|
r39136 | return _origrebase(ui, repo, action, opts, rbsrt, inmemory=inmemory) | ||
|
r38516 | |||
|
r39136 | def _origrebase(ui, repo, action, opts, rbsrt, inmemory=False, | ||
leaveunfinished=False): | ||||
assert action != 'stop' | ||||
|
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') | ||||
|
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')) | ||
|
r39136 | if action: | ||
|
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')) | ||
|
r39136 | if action == 'abort' and opts.get('tool', False): | ||
|
r13856 | ui.warn(_('tool option will be ignored\n')) | ||
|
r39136 | if action == 'continue': | ||
|
r30273 | ms = mergemod.mergestate.read(repo) | ||
|
r30495 | mergeutil.checkunresolved(ms) | ||
|
r6906 | |||
|
r39136 | retcode = rbsrt._prepareabortorcontinue(isabort=(action == 'abort')) | ||
|
r29472 | if retcode is not None: | ||
return retcode | ||||
|
r6906 | else: | ||
|
r37043 | destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef, | ||
revf, destspace=destspace) | ||||
|
r34006 | retcode = rbsrt._preparenewrebase(destmap) | ||
|
r29473 | if retcode is not None: | ||
return retcode | ||||
|
r36793 | storecollapsemsg(repo, rbsrt.collapsemsg) | ||
|
r21027 | |||
|
r33569 | tr = None | ||
|
r33621 | |||
singletr = ui.configbool('rebase', 'singletransaction') | ||||
if singletr: | ||||
|
r33569 | tr = repo.transaction('rebase') | ||
|
r35496 | |||
# If `rebase.singletransaction` is enabled, wrap the entire operation in | ||||
# one transaction here. Otherwise, transactions are obtained when | ||||
# committing each node, which is slower but allows partial success. | ||||
|
r33569 | with util.acceptintervention(tr): | ||
|
r35496 | # Same logic for the dirstate guard, except we don't create one when | ||
# rebasing in-memory (it's not needed). | ||||
|
r36791 | dsguard = None | ||
|
r35496 | if singletr and not inmemory: | ||
|
r33621 | dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||
with util.acceptintervention(dsguard): | ||||
rbsrt._performrebase(tr) | ||||
|
r38391 | if not leaveunfinished: | ||
|
r38852 | rbsrt._finishrebase() | ||
|
r6906 | |||
|
r37043 | def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None, | ||
|
r35389 | revf=None, destspace=None): | ||
|
r34006 | """use revisions argument to define destmap {srcrev: destrev}""" | ||
|
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')) | ||||
|
r37043 | if not inmemory: | ||
|
r35292 | cmdutil.checkunfinished(repo) | ||
cmdutil.bailifchanged(repo) | ||||
|
r28136 | |||
|
r31731 | if ui.configbool('commands', 'rebase.requiredest') and not destf: | ||
raise error.Abort(_('you must specify a destination'), | ||||
hint=_('use: hg rebase -d REV')) | ||||
|
r34007 | dest = None | ||
|
r28136 | |||
if revf: | ||||
rebaseset = scmutil.revrange(repo, revf) | ||||
if not rebaseset: | ||||
ui.status(_('empty "rev" revision set - nothing to rebase\n')) | ||||
|
r34006 | return None | ||
|
r28136 | elif srcf: | ||
src = scmutil.revrange(repo, [srcf]) | ||||
if not src: | ||||
ui.status(_('empty "source" revision set - nothing to rebase\n')) | ||||
|
r34006 | return None | ||
|
r28136 | 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")) | ||||
|
r34006 | return None | ||
|
r34007 | if destf: | ||
# --base does not support multiple destinations | ||||
dest = scmutil.revsingle(repo, destf) | ||||
else: | ||||
|
r29043 | dest = repo[_destrebase(repo, base, destspace=destspace)] | ||
|
r36493 | destf = bytes(dest) | ||
|
r28189 | |||
|
r30580 | roots = [] # selected children of branching points | ||
bpbase = {} # {branchingpoint: [origbase]} | ||||
for b in base: # group bases by branching points | ||||
|
r36423 | bp = repo.revs('ancestor(%d, %d)', b, dest.rev()).first() | ||
|
r30580 | 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')) | ||||
|
r36423 | elif not repo.revs('%ld - ::%d', base, dest.rev()): | ||
|
r28136 | if basef: | ||
ui.status(_('nothing to rebase - "base" %s is ' | ||||
'already an ancestor of destination ' | ||||
'%s\n') % | ||||
|
r36493 | ('+'.join(bytes(repo[r]) for r in base), | ||
|
r28136 | 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') % | ||||
|
r36493 | ('+'.join(bytes(repo[r]) for r in base), dest)) | ||
|
r34006 | return None | ||
|
r36993 | |||
|
r35333 | rebasingwcp = repo['.'].rev() in rebaseset | ||
|
r40686 | ui.log("rebase", "rebasing working copy parent: %r\n", rebasingwcp, | ||
rebase_rebasing_wcp=rebasingwcp) | ||||
|
r37043 | if inmemory and rebasingwcp: | ||
|
r35333 | # Check these since we did not before. | ||
cmdutil.checkunfinished(repo) | ||||
cmdutil.bailifchanged(repo) | ||||
|
r28189 | |||
if not destf: | ||||
|
r29043 | dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | ||
|
r36493 | destf = bytes(dest) | ||
|
r28189 | |||
|
r34007 | allsrc = revsetlang.formatspec('%ld', rebaseset) | ||
alias = {'ALLSRC': allsrc} | ||||
if dest is None: | ||||
try: | ||||
# fast path: try to resolve dest without SRC alias | ||||
dest = scmutil.revsingle(repo, destf, localalias=alias) | ||||
except error.RepoLookupError: | ||||
# multi-dest path: resolve dest for each SRC separately | ||||
destmap = {} | ||||
for r in rebaseset: | ||||
alias['SRC'] = revsetlang.formatspec('%d', r) | ||||
# use repo.anyrevs instead of scmutil.revsingle because we | ||||
# don't want to abort if destset is empty. | ||||
destset = repo.anyrevs([destf], user=True, localalias=alias) | ||||
size = len(destset) | ||||
if size == 1: | ||||
destmap[r] = destset.first() | ||||
elif size == 0: | ||||
ui.note(_('skipping %s - empty destination\n') % repo[r]) | ||||
else: | ||||
raise error.Abort(_('rebase destination for %s is not ' | ||||
'unique') % repo[r]) | ||||
if dest is not None: | ||||
# single-dest case: assign dest to each rev in rebaseset | ||||
destrev = dest.rev() | ||||
destmap = {r: destrev for r in rebaseset} # {srcrev: destrev} | ||||
if not destmap: | ||||
ui.status(_('nothing to rebase - empty destination\n')) | ||||
return None | ||||
|
r34006 | |||
return destmap | ||||
|
r28136 | |||
|
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() | ||||
|
r36496 | raise error.Abort(_('unable to collapse on top of %d, there is more ' | ||
|
r19956 | 'than one external parent: %s') % | ||
|
r32248 | (max(destancestors), | ||
|
r36493 | ', '.join("%d" % p for p in sorted(parents)))) | ||
|
r10351 | |||
|
r37061 | def commitmemorynode(repo, p1, p2, wctx, editor, extra, user, date, commitmsg): | ||
|
r37060 | '''Commit the memory changes with parents p1 and p2. | ||
|
r35320 | Return node of committed revision.''' | ||
|
r37058 | # Replicates the empty check in ``repo.commit``. | ||
if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'): | ||||
return None | ||||
|
r35320 | |||
|
r37058 | # By convention, ``extra['branch']`` (set by extrafn) clobbers | ||
# ``branch`` (used when passing ``--keepbranches``). | ||||
branch = repo[p1].branch() | ||||
if 'branch' in extra: | ||||
branch = extra['branch'] | ||||
|
r35320 | |||
|
r37058 | memctx = wctx.tomemctx(commitmsg, parents=(p1, p2), date=date, | ||
|
r37060 | extra=extra, user=user, branch=branch, editor=editor) | ||
|
r37058 | commitres = repo.commitctx(memctx) | ||
wctx.clean() # Might be reused | ||||
return commitres | ||||
|
r35320 | |||
|
r37061 | def commitnode(repo, p1, p2, editor, extra, user, date, commitmsg): | ||
|
r37060 | '''Commit the wd changes with parents p1 and p2. | ||
|
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()) | |||
|
r22038 | |||
|
r37058 | # Commit might fail if unresolved files exist | ||
|
r37060 | newnode = repo.commit(text=commitmsg, user=user, date=date, | ||
extra=extra, editor=editor) | ||||
|
r22038 | |||
r33135 | repo.dirstate.setbranch(repo[newnode].branch()) | |||
return newnode | ||||
|
r6906 | |||
|
r36790 | def rebasenode(repo, rev, p1, base, collapse, dest, wctx): | ||
|
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 | ||
|
r35318 | if wctx.isinmemory(): | ||
wctx.setbase(repo[p1]) | ||||
|
r6906 | else: | ||
|
r35318 | if repo['.'].rev() != p1: | ||
repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | ||||
|
r40402 | mergemod.update(repo, p1, branchmerge=False, force=True) | ||
|
r35318 | else: | ||
repo.ui.debug(" already in destination\n") | ||||
|
r35411 | # This is, alas, necessary to invalidate workingctx's manifest cache, | ||
# as well as other data we litter on it in other places. | ||||
wctx = repo[None] | ||||
|
r35318 | 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. | ||||
|
r40402 | stats = mergemod.update(repo, rev, branchmerge=True, force=True, | ||
ancestor=base, mergeancestor=collapse, | ||||
|
r35319 | labels=['dest', 'source'], wc=wctx) | ||
|
r22905 | if collapse: | ||
|
r34788 | copies.duplicatecopies(repo, wctx, 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() | ||||
|
r34788 | copies.duplicatecopies(repo, wctx, rev, p1rev, skiprev=dest) | ||
|
r22905 | return stats | ||
|
r6923 | |||
|
r34010 | def adjustdest(repo, rev, destmap, state, skipped): | ||
|
r41674 | r"""adjust rebase destination given the current rebase state | ||
|
r33591 | |||
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. | ||||
|
r34007 | For example, when doing rebasing B+E to F, C to G, rebase will first move B | ||
to B1, and E's destination will be adjusted from F to B1. | ||||
|
r33591 | |||
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) | ||||
| | | ||||
|
r34007 | | C <- rebased as C', different destination | ||
|
r33591 | | | | ||
|
r34007 | | B <- rebased as B1 C' | ||
|/ | | ||||
A G <- destination of C, different | ||||
|
r33591 | |||
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 | ||||
|
r34008 | |||
Besides, adjust dest according to existing rebase information. For example, | ||||
B C D B needs to be rebased on top of C, C needs to be rebased on top | ||||
\|/ of D. We will rebase C first. | ||||
A | ||||
C' After rebasing C, when considering B's destination, use C' | ||||
| instead of the original C. | ||||
B D | ||||
\ / | ||||
A | ||||
|
r33591 | """ | ||
|
r34006 | # pick already rebased revs with same dest from state as interesting source | ||
dest = destmap[rev] | ||||
|
r34010 | source = [s for s, d in state.items() | ||
if d > 0 and destmap[s] == dest and s not in skipped] | ||||
|
r33848 | |||
|
r33591 | result = [] | ||
for prev in repo.changelog.parentrevs(rev): | ||||
adjusted = dest | ||||
if prev != nullrev: | ||||
candidate = repo.revs('max(%ld and (::%d))', source, prev).first() | ||||
if candidate is not None: | ||||
adjusted = state[candidate] | ||||
|
r34008 | if adjusted == dest and dest in state: | ||
adjusted = state[dest] | ||||
if adjusted == revtodo: | ||||
# sortsource should produce an order that makes this impossible | ||||
raise error.ProgrammingError( | ||||
'rev %d should be rebased already at this time' % dest) | ||||
|
r33591 | result.append(adjusted) | ||
return result | ||||
|
r33845 | def _checkobsrebase(repo, ui, rebaseobsrevs, rebaseobsskipped): | ||
|
r28685 | """ | ||
Abort if rebase will create divergence or rebase is noop because of markers | ||||
`rebaseobsrevs`: set of obsolete revision in source | ||||
`rebaseobsskipped`: set of revisions from source skipped because they have | ||||
|
r36013 | successors in destination or no non-obsolete successor. | ||
|
r28685 | """ | ||
# Obsolete node with successors not in dest leads to divergence | ||||
divergenceok = ui.configbool('experimental', | ||||
|
r34873 | 'evolution.allowdivergence') | ||
|
r28685 | divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | ||
if divergencebasecandidates and not divergenceok: | ||||
|
r36493 | divhashes = (bytes(repo[r]) | ||
|
r28685 | for r in divergencebasecandidates) | ||
msg = _("this rebase will cause " | ||||
"divergences from: %s") | ||||
h = _("to force the rebase please set " | ||||
|
r34873 | "experimental.evolution.allowdivergence=True") | ||
|
r28685 | raise error.Abort(msg % (",".join(divhashes),), hint=h) | ||
|
r34097 | def successorrevs(unfi, rev): | ||
|
r33783 | """yield revision numbers for successors of rev""" | ||
|
r34097 | assert unfi.filtername is None | ||
|
r33783 | nodemap = unfi.changelog.nodemap | ||
for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]): | ||||
if s in nodemap: | ||||
yield nodemap[s] | ||||
|
r34010 | def defineparents(repo, rev, destmap, state, skipped, obsskipped): | ||
|
r33783 | """Return new parents and optionally a merge base for rev being rebased | ||
The destination specified by "dest" cannot always be used directly because | ||||
previously rebase result could affect destination. For example, | ||||
|
r6906 | |||
|
r33783 | D E rebase -r C+D+E -d B | ||
|/ C will be rebased to C' | ||||
B C D's new destination will be C' instead of B | ||||
|/ E's new destination will be C' instead of B | ||||
A | ||||
|
r6906 | |||
|
r33783 | The new parents of a merge is slightly more complicated. See the comment | ||
block below. | ||||
""" | ||||
|
r34094 | # use unfiltered changelog since successorrevs may return filtered nodes | ||
|
r34097 | assert repo.filtername is None | ||
cl = repo.changelog | ||||
|
r38688 | isancestor = cl.isancestorrev | ||
|
r33783 | |||
|
r34006 | dest = destmap[rev] | ||
|
r33783 | oldps = repo.changelog.parentrevs(rev) # old parents | ||
newps = [nullrev, nullrev] # new parents | ||||
|
r34010 | dests = adjustdest(repo, rev, destmap, state, skipped) | ||
|
r33783 | bases = list(oldps) # merge base candidates, initially just old parents | ||
|
r6906 | |||
|
r33783 | if all(r == nullrev for r in oldps[1:]): | ||
# For non-merge changeset, just move p to adjusted dest as requested. | ||||
newps[0] = dests[0] | ||||
else: | ||||
# For merge changeset, if we move p to dests[i] unconditionally, both | ||||
# parents may change and the end result looks like "the merge loses a | ||||
# parent", which is a surprise. This is a limit because "--dest" only | ||||
# accepts one dest per src. | ||||
# | ||||
# Therefore, only move p with reasonable conditions (in this order): | ||||
# 1. use dest, if dest is a descendent of (p or one of p's successors) | ||||
# 2. use p's rebased result, if p is rebased (state[p] > 0) | ||||
# | ||||
# Comparing with adjustdest, the logic here does some additional work: | ||||
# 1. decide which parents will not be moved towards dest | ||||
# 2. if the above decision is "no", should a parent still be moved | ||||
# because it was rebased? | ||||
# | ||||
# For example: | ||||
# | ||||
# C # "rebase -r C -d D" is an error since none of the parents | ||||
# /| # can be moved. "rebase -r B+C -d D" will move C's parent | ||||
# A B D # B (using rule "2."), since B will be rebased. | ||||
# | ||||
# The loop tries to be not rely on the fact that a Mercurial node has | ||||
# at most 2 parents. | ||||
for i, p in enumerate(oldps): | ||||
np = p # new parent | ||||
if any(isancestor(x, dests[i]) for x in successorrevs(repo, p)): | ||||
np = dests[i] | ||||
elif p in state and state[p] > 0: | ||||
np = state[p] | ||||
|
r23484 | |||
|
r33783 | # "bases" only record "special" merge bases that cannot be | ||
# calculated from changelog DAG (i.e. isancestor(p, np) is False). | ||||
# For example: | ||||
# | ||||
# B' # rebase -s B -d D, when B was rebased to B'. dest for C | ||||
# | C # is B', but merge base for C is B, instead of | ||||
# D | # changelog.ancestor(C, B') == A. If changelog DAG and | ||||
# | B # "state" edges are merged (so there will be an edge from | ||||
# |/ # B to B'), the merge base is still ancestor(C, B') in | ||||
# A # the merged graph. | ||||
# | ||||
# Also see https://bz.mercurial-scm.org/show_bug.cgi?id=1950#c8 | ||||
# which uses "virtual null merge" to explain this situation. | ||||
if isancestor(p, np): | ||||
bases[i] = nullrev | ||||
# If one parent becomes an ancestor of the other, drop the ancestor | ||||
for j, x in enumerate(newps[:i]): | ||||
if x == nullrev: | ||||
continue | ||||
|
r33863 | if isancestor(np, x): # CASE-1 | ||
|
r33783 | np = nullrev | ||
|
r33863 | elif isancestor(x, np): # CASE-2 | ||
|
r33783 | newps[j] = np | ||
np = nullrev | ||||
|
r33863 | # New parents forming an ancestor relationship does not | ||
# mean the old parents have a similar relationship. Do not | ||||
# set bases[x] to nullrev. | ||||
|
r33783 | bases[j], bases[i] = bases[i], bases[j] | ||
newps[i] = np | ||||
# "rebasenode" updates to new p1, and the old p1 will be used as merge | ||||
# base. If only p2 changes, merging using unchanged p1 as merge base is | ||||
# suboptimal. Therefore swap parents to make the merge sane. | ||||
if newps[1] != nullrev and oldps[0] == newps[0]: | ||||
assert len(newps) == 2 and len(oldps) == 2 | ||||
newps.reverse() | ||||
bases.reverse() | ||||
# No parent change might be an error because we fail to make rev a | ||||
# descendent of requested dest. This can happen, for example: | ||||
# | ||||
# C # rebase -r C -d D | ||||
# /| # None of A and B will be changed to D and rebase fails. | ||||
# A B D | ||||
if set(newps) == set(oldps) and dest not in newps: | ||||
|
r33786 | raise error.Abort(_('cannot rebase %d:%s without ' | ||
'moving at least one of its parents') | ||||
% (rev, repo[rev])) | ||||
|
r33783 | |||
|
r34008 | # Source should not be ancestor of dest. The check here guarantees it's | ||
# impossible. With multi-dest, the initial check does not cover complex | ||||
# cases since we don't have abstractions to dry-run rebase cheaply. | ||||
if any(p != nullrev and isancestor(rev, p) for p in newps): | ||||
raise error.Abort(_('source is ancestor of destination')) | ||||
|
r33783 | # "rebasenode" updates to new p1, use the corresponding merge base. | ||
if bases[0] != nullrev: | ||||
base = bases[0] | ||||
else: | ||||
|
r23484 | base = None | ||
|
r33783 | |||
# Check if the merge will contain unwanted changes. That may happen if | ||||
# there are multiple special (non-changelog ancestor) merge bases, which | ||||
# cannot be handled well by the 3-way merge algorithm. For example: | ||||
# | ||||
# F | ||||
# /| | ||||
# D E # "rebase -r D+E+F -d Z", when rebasing F, if "D" was chosen | ||||
# | | # as merge base, the difference between D and F will include | ||||
# B C # C, so the rebased F will contain C surprisingly. If "E" was | ||||
# |/ # chosen, the rebased F will contain B. | ||||
# A Z | ||||
# | ||||
# But our merge base candidates (D and E in above case) could still be | ||||
# better than the default (ancestor(F, Z) == null). Therefore still | ||||
# pick one (so choose p1 above). | ||||
if sum(1 for b in bases if b != nullrev) > 1: | ||||
|
r33863 | unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i] | ||
for i, base in enumerate(bases): | ||||
if base == nullrev: | ||||
continue | ||||
# Revisions in the side (not chosen as merge base) branch that | ||||
# might contain "surprising" contents | ||||
siderevs = list(repo.revs('((%ld-%d) %% (%d+%d))', | ||||
bases, base, base, dest)) | ||||
|
r23484 | |||
|
r33863 | # If those revisions are covered by rebaseset, the result is good. | ||
# A merge in rebaseset would be considered to cover its ancestors. | ||||
if siderevs: | ||||
|
r34010 | rebaseset = [r for r, d in state.items() | ||
if d > 0 and r not in obsskipped] | ||||
|
r33863 | merges = [r for r in rebaseset | ||
if cl.parentrevs(r)[1] != nullrev] | ||||
unwanted[i] = list(repo.revs('%ld - (::%ld) - %ld', | ||||
siderevs, merges, rebaseset)) | ||||
|
r33783 | |||
|
r33863 | # Choose a merge base that has a minimal number of unwanted revs. | ||
l, i = min((len(revs), i) | ||||
for i, revs in enumerate(unwanted) if revs is not None) | ||||
base = bases[i] | ||||
# newps[0] should match merge base if possible. Currently, if newps[i] | ||||
# is nullrev, the only case is newps[i] and newps[j] (j < i), one is | ||||
# the other's ancestor. In that case, it's fine to not swap newps here. | ||||
# (see CASE-1 and CASE-2 above) | ||||
if i != 0 and newps[i] != nullrev: | ||||
newps[0], newps[i] = newps[i], newps[0] | ||||
|
r33783 | |||
|
r33863 | # The merge will include unwanted revisions. Abort now. Revisit this if | ||
# we have a more advanced merge algorithm that handles multiple bases. | ||||
if l > 0: | ||||
unwanteddesc = _(' or ').join( | ||||
(', '.join('%d:%s' % (r, repo[r]) for r in revs) | ||||
for revs in unwanted if revs is not None)) | ||||
raise error.Abort( | ||||
_('rebasing %d:%s will include unwanted changes from %s') | ||||
% (rev, repo[rev], unwanteddesc)) | ||||
repo.ui.debug(" future parents are %d and %d\n" % tuple(newps)) | ||||
|
r33783 | |||
return newps[0], newps[1], 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) | ||||
|
r36412 | for line in patch.linereader(open(mqpatch, 'rb')): | ||
|
r7955 | 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] | ||
|
r36493 | repo.ui.note(_('updating mq patch %s to %d:%s\n') % | ||
|
r23520 | (name, state[rev], repo[state[rev]])) | ||
|
r11537 | mq.qimport(repo, (), patchname=name, git=isgit, | ||
|
r36493 | rev=["%d" % 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' | ||||
|
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 | ||||
|
r34008 | def sortsource(destmap): | ||
"""yield source revisions in an order that we only rebase things once | ||||
If source and destination overlaps, we should filter out revisions | ||||
depending on other revisions which hasn't been rebased yet. | ||||
Yield a sorted list of revisions each time. | ||||
For example, when rebasing A to B, B to C. This function yields [B], then | ||||
[A], indicating B needs to be rebased first. | ||||
Raise if there is a cycle so the rebase is impossible. | ||||
""" | ||||
srcset = set(destmap) | ||||
while srcset: | ||||
srclist = sorted(srcset) | ||||
result = [] | ||||
for r in srclist: | ||||
if destmap[r] not in srcset: | ||||
result.append(r) | ||||
if not result: | ||||
raise error.Abort(_('source and destination form a cycle')) | ||||
srcset -= set(result) | ||||
yield result | ||||
|
r34010 | def buildstate(repo, destmap, collapse): | ||
|
r15267 | '''Define which revisions are going to be rebased and where | ||
|
r6906 | |||
|
r15267 | repo: repo | ||
|
r34006 | destmap: {srcrev: destrev} | ||
|
r17005 | ''' | ||
|
r34006 | rebaseset = destmap.keys() | ||
|
r31297 | originalwd = repo['.'].rev() | ||
|
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. | ||||
|
r34006 | if 'qtip' in repo.tags(): | ||
mqapplied = set(repo[s.node].rev() for s in repo.mq.applied) | ||||
if set(destmap.values()) & mqapplied: | ||||
raise error.Abort(_('cannot rebase onto an applied mq patch')) | ||||
|
r10672 | |||
|
r34008 | # Get "cycle" error early by exhausting the generator. | ||
sortedsrc = list(sortsource(destmap)) # a list of sorted revs | ||||
if not sortedsrc: | ||||
raise error.Abort(_('no matching revisions')) | ||||
# Only check the first batch of revisions to rebase not depending on other | ||||
# rebaseset. This means "source is ancestor of destination" for the second | ||||
# (and following) batches of revisions are not checked here. We rely on | ||||
# "defineparents" to do that check. | ||||
roots = list(repo.set('roots(%ld)', sortedsrc[0])) | ||||
|
r15267 | if not roots: | ||
|
r26587 | raise error.Abort(_('no matching revisions')) | ||
|
r36285 | def revof(r): | ||
return r.rev() | ||||
roots = sorted(roots, key=revof) | ||||
|
r32175 | state = dict.fromkeys(rebaseset, revtodo) | ||
|
r34008 | emptyrebase = (len(sortedsrc) == 1) | ||
|
r18424 | for root in roots: | ||
|
r34006 | dest = repo[destmap[root.rev()]] | ||
|
r18424 | 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)) | ||
|
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 | ||||
|
r34006 | return originalwd, destmap, state | ||
|
r6906 | |||
|
r34366 | def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None, | ||
|
r38835 | keepf=False, fm=None, backup=True): | ||
|
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 | ||||
|
r34364 | `collapsedas` node. | ||
If `keepf` is not True, the rebase has --keep set and no nodes should be | ||||
removed (but bookmarks still need to be moved). | ||||
|
r38835 | |||
If `backup` is False, no backup will be stored when stripping rebased | ||||
revisions. | ||||
|
r34364 | """ | ||
|
r33332 | tonode = repo.changelog.node | ||
|
r34364 | replacements = {} | ||
moves = {} | ||||
|
r39951 | stripcleanup = not obsolete.isenabled(repo, obsolete.createmarkersopt) | ||
|
r39955 | |||
collapsednodes = [] | ||||
|
r33333 | for rev, newrev in sorted(state.items()): | ||
if newrev >= 0 and newrev != rev: | ||||
|
r34364 | oldnode = tonode(rev) | ||
newnode = collapsedas or tonode(newrev) | ||||
moves[oldnode] = newnode | ||||
if not keepf: | ||||
|
r39951 | succs = None | ||
|
r34364 | if rev in skipped: | ||
|
r39951 | if stripcleanup or not repo[rev].obsolete(): | ||
succs = () | ||||
|
r39955 | elif collapsedas: | ||
collapsednodes.append(oldnode) | ||||
|
r34364 | else: | ||
succs = (newnode,) | ||||
|
r39951 | if succs is not None: | ||
|
r39954 | replacements[(oldnode,)] = succs | ||
|
r39955 | if collapsednodes: | ||
replacements[tuple(collapsednodes)] = (collapsedas,) | ||||
|
r38835 | scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup) | ||
|
r34884 | if fm: | ||
|
r35123 | hf = fm.hexfunc | ||
fl = fm.formatlist | ||||
fd = fm.formatdict | ||||
|
r39953 | changes = {} | ||
|
r39954 | for oldns, newn in replacements.iteritems(): | ||
for oldn in oldns: | ||||
changes[hf(oldn)] = fl([hf(n) for n in newn], name='node') | ||||
|
r39953 | nodechanges = fd(changes, key="oldnode", value="newnodes") | ||
|
r34884 | fm.data(nodechanges=nodechanges) | ||
|
r17611 | |||
|
r7216 | def pullrebase(orig, ui, repo, *args, **opts): | ||
|
r6906 | 'Call rebase after pull if the latter has been invoked with --rebase' | ||
|
r35003 | if opts.get(r'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(): | ||
|
r35003 | if opts.get(r'update'): | ||
del opts[r'update'] | ||||
|
r26029 | 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 | ||||
|
r35003 | if r'rev' in opts: | ||
del opts[r'rev'] | ||||
|
r26029 | # positional argument from pull conflicts with rebase's own | ||
# --source. | ||||
|
r35003 | if r'source' in opts: | ||
del opts[r'source'] | ||||
|
r29044 | # revsprepull is the len of the repo, not revnum of tip. | ||
destspace = list(repo.changelog.revs(start=revsprepull)) | ||||
|
r35003 | opts[r'_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: | ||
|
r35003 | if opts.get(r'tool'): | ||
|
r26587 | raise error.Abort(_('--tool can only be used with --rebase')) | ||
|
r26960 | ret = orig(ui, repo, *args, **opts) | ||
return ret | ||||
|
r6906 | |||
|
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()) | ||||
|
r34006 | def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap): | ||
|
r35049 | """Return (obsoletenotrebased, obsoletewithoutsuccessorindestination). | ||
`obsoletenotrebased` is a mapping mapping obsolete => successor for all | ||||
obsolete nodes to be rebased given in `rebaseobsrevs`. | ||||
|
r27012 | |||
|
r35049 | `obsoletewithoutsuccessorindestination` is a set with obsolete revisions | ||
without a successor in destination. | ||||
|
r36013 | |||
`obsoleteextinctsuccessors` is a set of obsolete revisions with only | ||||
obsolete successors. | ||||
|
r35049 | """ | ||
|
r26349 | obsoletenotrebased = {} | ||
|
r42224 | obsoletewithoutsuccessorindestination = set() | ||
obsoleteextinctsuccessors = set() | ||||
|
r26349 | |||
|
r34097 | assert repo.filtername is None | ||
|
r26674 | cl = repo.changelog | ||
|
r34005 | nodemap = cl.nodemap | ||
|
r38695 | extinctrevs = set(repo.revs('extinct()')) | ||
|
r34005 | for srcrev in rebaseobsrevs: | ||
srcnode = cl.node(srcrev) | ||||
# XXX: more advanced APIs are required to handle split correctly | ||||
|
r36015 | successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode])) | ||
|
r36012 | # obsutil.allsuccessors includes node itself | ||
successors.remove(srcnode) | ||||
|
r38695 | succrevs = {nodemap[s] for s in successors if s in nodemap} | ||
if succrevs.issubset(extinctrevs): | ||||
|
r36013 | # all successors are extinct | ||
obsoleteextinctsuccessors.add(srcrev) | ||||
|
r36012 | if not successors: | ||
# no successor | ||||
|
r34005 | obsoletenotrebased[srcrev] = None | ||
else: | ||||
|
r38694 | dstrev = destmap[srcrev] | ||
for succrev in succrevs: | ||||
if cl.isancestorrev(succrev, dstrev): | ||||
obsoletenotrebased[srcrev] = succrev | ||||
|
r34005 | break | ||
|
r35049 | else: | ||
# If 'srcrev' has a successor in rebase set but none in | ||||
# destination (which would be catched above), we shall skip it | ||||
# and its descendants to avoid divergence. | ||||
|
r39364 | if srcrev in extinctrevs or any(s in destmap for s in succrevs): | ||
|
r35049 | obsoletewithoutsuccessorindestination.add(srcrev) | ||
|
r27012 | |||
|
r36013 | return ( | ||
obsoletenotrebased, | ||||
obsoletewithoutsuccessorindestination, | ||||
obsoleteextinctsuccessors, | ||||
) | ||||
|
r26349 | |||
|
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')]) | ||||