rebase.py
1328 lines
| 52.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 | ''' | ||
|
r14884 | from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks | ||
|
r18933 | from mercurial import extensions, patch, scmutil, phases, obsolete, error | ||
|
r28394 | from mercurial import copies, destutil, repoview, registrar, revset | ||
|
r6906 | from mercurial.commands import templateopts | ||
|
r23517 | from mercurial.node import nullrev, nullid, hex, short | ||
|
r8112 | from mercurial.lock import release | ||
|
r6906 | from mercurial.i18n import _ | ||
import os, errno | ||||
|
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 = {} | ||
command = cmdutil.command(cmdtable) | ||||
|
r25186 | # Note for extension authors: ONLY specify testedwith = 'internal' for | ||
# 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. | ||||
|
r16743 | testedwith = 'internal' | ||
|
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 | ||||
|
r28189 | def _destrebase(repo, sourceset): | ||
"""small wrapper around destmerge to pass the right extra args | ||||
Please wrap destutil.destmerge instead.""" | ||||
return destutil.destmerge(repo, action='rebase', sourceset=sourceset, | ||||
onheadcheck=False) | ||||
|
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: | ||||
sourceset = revset.getset(repo, revset.fullreposet(repo), x) | ||||
return subset & revset.baseset([_destrebase(repo, sourceset)]) | ||||
|
r26301 | |||
|
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 | ||||
|
r19971 | Returns 0 on success, 1 if nothing to rebase or there are | ||
unresolved conflicts. | ||||
|
r22790 | |||
|
r6906 | """ | ||
|
r7280 | originalwd = target = None | ||
|
r18755 | activebookmark = None | ||
|
r6906 | external = nullrev | ||
|
r26781 | # 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 | ||||
|
r26669 | # will be what contains most of the rebase progress state. | ||
|
r8454 | state = {} | ||
skipped = set() | ||||
|
r10351 | targetancestors = set() | ||
|
r6906 | |||
|
r15219 | |||
|
r6906 | lock = wlock = None | ||
try: | ||||
|
r15874 | wlock = repo.wlock() | ||
|
r6906 | lock = repo.lock() | ||
# 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', []) | ||
|
r6906 | contf = opts.get('continue') | ||
abortf = opts.get('abort') | ||||
collapsef = opts.get('collapse', False) | ||||
|
r14635 | collapsemsg = cmdutil.logmessage(ui, opts) | ||
|
r26869 | date = opts.get('date', None) | ||
|
r19860 | e = opts.get('extrafn') # internal, used by e.g. hgsubversion | ||
|
r27976 | extrafns = [_savegraft] | ||
|
r19860 | if e: | ||
extrafns = [e] | ||||
|
r7952 | keepf = opts.get('keep', False) | ||
keepbranchesf = opts.get('keepbranches', False) | ||||
|
r10677 | # keepopen is not meant for use on the command line, but by | ||
# other extensions | ||||
keepopen = opts.get('keepopen', False) | ||||
|
r7468 | |||
|
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 | |||
|
r13661 | if collapsemsg and not 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')) | ||
|
r6906 | if 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')) | ||
|
r6906 | |||
|
r19848 | try: | ||
(originalwd, target, state, skipped, collapsef, keepf, | ||||
keepbranchesf, external, activebookmark) = restorestatus(repo) | ||||
|
r28185 | collapsemsg = restorecollapsemsg(repo) | ||
|
r19848 | except error.RepoLookupError: | ||
if abortf: | ||||
clearstatus(repo) | ||||
|
r28185 | clearcollapsemsg(repo) | ||
|
r19848 | repo.ui.warn(_('rebase aborted (no revision is removed,' | ||
' only broken state is cleared)\n')) | ||||
return 0 | ||||
else: | ||||
msg = _('cannot continue inconsistent rebase') | ||||
|
r20313 | hint = _('use "hg rebase --abort" to clear broken state') | ||
|
r26587 | raise error.Abort(msg, hint=hint) | ||
|
r6906 | if abortf: | ||
|
r24758 | return abort(repo, originalwd, target, state, | ||
activebookmark=activebookmark) | ||||
|
r6906 | else: | ||
|
r28136 | dest, rebaseset = _definesets(ui, repo, destf, srcf, basef, revf) | ||
if dest is None: | ||||
return _nothingtorebase() | ||||
|
r15271 | |||
|
r22952 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | ||
if (not (keepf or allowunstable) | ||||
|
r18269 | and repo.revs('first(children(%ld) - %ld)', | ||
|
r18164 | rebaseset, rebaseset)): | ||
|
r26587 | raise error.Abort( | ||
|
r15272 | _("can't remove original changesets with" | ||
" unrebased descendants"), | ||||
hint=_('use --keep to keep original changesets')) | ||||
|
r26349 | obsoletenotrebased = {} | ||
|
r28429 | if ui.configbool('experimental', 'rebaseskipobsolete', | ||
default=True): | ||||
|
r26349 | rebasesetrevs = set(rebaseset) | ||
|
r27790 | rebaseobsrevs = _filterobsoleterevs(repo, rebasesetrevs) | ||
|
r26349 | obsoletenotrebased = _computeobsoletenotrebased(repo, | ||
|
r27744 | rebaseobsrevs, | ||
|
r26349 | dest) | ||
|
r27745 | rebaseobsskipped = set(obsoletenotrebased) | ||
|
r26349 | |||
|
r27746 | # Obsolete node with successors not in dest leads to divergence | ||
|
r28280 | divergenceok = ui.configbool('experimental', | ||
|
r27746 | 'allowdivergence') | ||
divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | ||||
if divergencebasecandidates and not divergenceok: | ||||
|
r28188 | divhashes = (str(repo[r]) | ||
for r in divergencebasecandidates) | ||||
msg = _("this rebase will cause " | ||||
"divergences from: %s") | ||||
|
r27746 | h = _("to force the rebase please set " | ||
|
r28280 | "experimental.allowdivergence=True") | ||
|
r28188 | raise error.Abort(msg % (",".join(divhashes),), hint=h) | ||
|
r27746 | |||
|
r26349 | # - plain prune (no successor) changesets are rebased | ||
# - split changesets are not rebased if at least one of the | ||||
# changeset resulting from the split is an ancestor of dest | ||||
|
r27745 | rebaseset = rebasesetrevs - rebaseobsskipped | ||
|
r27577 | if rebasesetrevs and not rebaseset: | ||
msg = _('all requested changesets have equivalents ' | ||||
'or were marked as obsolete') | ||||
hint = _('to force the rebase, set the config ' | ||||
'experimental.rebaseskipobsolete to False') | ||||
raise error.Abort(msg, hint=hint) | ||||
|
r26349 | result = buildstate(repo, dest, rebaseset, collapsef, | ||
obsoletenotrebased) | ||||
|
r10351 | if not result: | ||
# Empty state built, nothing to rebase | ||||
|
r8615 | ui.status(_('nothing to rebase\n')) | ||
|
r26671 | return _nothingtorebase() | ||
|
r20250 | |||
root = min(rebaseset) | ||||
if not keepf and not repo[root].mutable(): | ||||
|
r26587 | raise error.Abort(_("can't rebase public changeset %s") | ||
|
r19059 | % repo[root], | ||
|
r23917 | hint=_('see "hg help phases" for details')) | ||
|
r20250 | |||
originalwd, target, state = result | ||||
if collapsef: | ||||
targetancestors = repo.changelog.ancestors([target], | ||||
inclusive=True) | ||||
external = externalparent(repo, state, targetancestors) | ||||
|
r6906 | |||
|
r21027 | if dest.closesbranch() and not keepbranchesf: | ||
ui.status(_('reopening closed branch head %s\n') % dest) | ||||
|
r27975 | if keepbranchesf: | ||
|
r27976 | # insert _savebranch at the start of extrafns so if | ||
# there's a user-provided extrafn it can clobber branch if | ||||
# desired | ||||
extrafns.insert(0, _savebranch) | ||||
|
r27975 | if collapsef: | ||
branches = set() | ||||
for rev in state: | ||||
branches.add(repo[rev].branch()) | ||||
if len(branches) > 1: | ||||
raise error.Abort(_('cannot collapse multiple named ' | ||||
'branches')) | ||||
|
r14897 | |||
|
r6906 | # Rebase | ||
|
r10351 | if not targetancestors: | ||
|
r18093 | targetancestors = repo.changelog.ancestors([target], inclusive=True) | ||
|
r6906 | |||
|
r14884 | # Keep track of the current bookmarks in order to reset them later | ||
currentbookmarks = repo._bookmarks.copy() | ||||
|
r24947 | activebookmark = activebookmark or repo._activebookmark | ||
|
r17046 | if activebookmark: | ||
|
r24944 | bookmarks.deactivate(repo) | ||
|
r14884 | |||
|
r19860 | extrafn = _makeextrafn(extrafns) | ||
|
r11729 | sortedstate = sorted(state) | ||
total = len(sortedstate) | ||||
pos = 0 | ||||
for rev in sortedstate: | ||||
|
r23517 | 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) | ||||
|
r11729 | pos += 1 | ||
|
r23490 | if state[rev] == revtodo: | ||
|
r23517 | ui.status(_('rebasing %s\n') % desc) | ||
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), | ||||
|
r12744 | _('changesets'), total) | ||
|
r23484 | p1, p2, base = defineparents(repo, rev, target, state, | ||
targetancestors) | ||||
|
r7952 | storestatus(repo, originalwd, target, state, collapsef, keepf, | ||
|
r18755 | keepbranchesf, external, activebookmark) | ||
|
r28185 | storecollapsemsg(repo, collapsemsg) | ||
|
r27167 | if len(repo[None].parents()) == 2: | ||
|
r10351 | repo.ui.debug('resuming interrupted rebase\n') | ||
else: | ||||
|
r13856 | try: | ||
|
r20790 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ||
'rebase') | ||||
|
r23484 | stats = rebasenode(repo, rev, p1, base, state, | ||
collapsef, target) | ||||
|
r13856 | if stats and stats[3] > 0: | ||
|
r18933 | raise error.InterventionRequired( | ||
_('unresolved conflicts (see hg ' | ||||
'resolve, then hg rebase --continue)')) | ||||
|
r13856 | finally: | ||
|
r20790 | ui.setconfig('ui', 'forcemerge', '', 'rebase') | ||
|
r10351 | if not collapsef: | ||
|
r23461 | merging = p2 != nullrev | ||
|
r22251 | editform = cmdutil.mergeeditform(merging, 'rebase') | ||
editor = cmdutil.getcommiteditor(editform=editform, **opts) | ||||
|
r23459 | newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn, | ||
|
r26360 | editor=editor, | ||
|
r26869 | keepbranches=keepbranchesf, | ||
date=date) | ||||
|
r10351 | else: | ||
# Skip commit if we are collapsing | ||||
|
r22405 | repo.dirstate.beginparentchange() | ||
|
r16551 | repo.setparents(repo[p1].node()) | ||
|
r22405 | repo.dirstate.endparentchange() | ||
|
r23459 | newnode = None | ||
|
r10351 | # Update the state | ||
|
r23459 | if newnode is not None: | ||
state[rev] = repo[newnode].rev() | ||||
|
r23519 | ui.debug('rebased as %s\n' % short(newnode)) | ||
|
r10351 | else: | ||
if not collapsef: | ||||
|
r26811 | ui.warn(_('note: rebase of %d:%s created no changes ' | ||
'to commit\n') % (rev, ctx)) | ||||
|
r10351 | skipped.add(rev) | ||
state[rev] = p1 | ||||
|
r23519 | ui.debug('next revision set to %s\n' % p1) | ||
|
r23517 | elif state[rev] == nullmerge: | ||
|
r23519 | ui.debug('ignoring null merge rebase of %s\n' % rev) | ||
|
r23517 | elif state[rev] == revignored: | ||
ui.status(_('not rebasing ignored %s\n') % desc) | ||||
|
r26349 | elif state[rev] == revprecursor: | ||
targetctx = repo[obsoletenotrebased[rev]] | ||||
desctarget = '%d:%s "%s"' % (targetctx.rev(), targetctx, | ||||
targetctx.description().split('\n', 1)[0]) | ||||
msg = _('note: not rebasing %s, already in destination as %s\n') | ||||
ui.status(msg % (desc, desctarget)) | ||||
|
r27012 | elif state[rev] == revpruned: | ||
msg = _('note: not rebasing %s, it has no successor\n') | ||||
ui.status(msg % desc) | ||||
|
r23517 | else: | ||
ui.status(_('already rebased %s as %s\n') % | ||||
(desc, repo[state[rev]])) | ||||
|
r10351 | |||
|
r11729 | ui.progress(_('rebasing'), None) | ||
|
r6906 | ui.note(_('rebase merging completed\n')) | ||
|
r10677 | if collapsef and not keepopen: | ||
|
r23484 | p1, p2, _base = defineparents(repo, min(state), target, | ||
state, targetancestors) | ||||
|
r22206 | editopt = opts.get('edit') | ||
editform = 'rebase.collapse' | ||||
|
r13661 | if collapsemsg: | ||
commitmsg = collapsemsg | ||||
else: | ||||
commitmsg = 'Collapsed revision' | ||||
for rebased in state: | ||||
|
r18446 | if rebased not in skipped and state[rebased] > nullmerge: | ||
|
r13661 | commitmsg += '\n* %s' % repo[rebased].description() | ||
|
r22206 | editopt = True | ||
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | ||||
|
r23459 | newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg, | ||
|
r26360 | extrafn=extrafn, editor=editor, | ||
|
r26869 | keepbranches=keepbranchesf, | ||
date=date) | ||||
|
r23460 | if newnode is None: | ||
newrev = target | ||||
else: | ||||
newrev = repo[newnode].rev() | ||||
|
r19986 | for oldrev in state.iterkeys(): | ||
if state[oldrev] > nullmerge: | ||||
|
r23460 | state[oldrev] = newrev | ||
|
r6906 | |||
if 'qtip' in repo.tags(): | ||||
updatemq(repo, state, skipped, **opts) | ||||
|
r14884 | if currentbookmarks: | ||
# Nodeids are needed to reset bookmarks | ||||
nstate = {} | ||||
for k, v in state.iteritems(): | ||||
|
r18446 | if v > nullmerge: | ||
|
r14884 | nstate[repo[k].node()] = repo[v].node() | ||
|
r18549 | # XXX this is the same as dest.node() for the non-continue path -- | ||
# this should probably be cleaned up | ||||
targetnode = repo[target].node() | ||||
|
r14884 | |||
|
r19925 | # restore original working directory | ||
# (we do this before stripping) | ||||
newwd = state.get(originalwd, originalwd) | ||||
|
r23440 | if newwd < 0: | ||
# original directory is a parent of rebase set root or ignored | ||||
newwd = originalwd | ||||
|
r19925 | 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) | ||||
|
r7952 | if not keepf: | ||
|
r17613 | collapsedas = None | ||
if collapsef: | ||||
|
r23459 | collapsedas = newnode | ||
|
r18444 | clearrebased(ui, repo, state, skipped, collapsedas) | ||
|
r6906 | |||
|
r27866 | with repo.transaction('bookmark') as tr: | ||
|
r27058 | if currentbookmarks: | ||
|
r27059 | updatebookmarks(repo, targetnode, nstate, currentbookmarks, tr) | ||
|
r27058 | if activebookmark not in repo._bookmarks: | ||
# active bookmark was divergent one and has been deleted | ||||
activebookmark = None | ||||
|
r27229 | clearstatus(repo) | ||
|
r28185 | clearcollapsemsg(repo) | ||
|
r14884 | |||
|
r11203 | ui.note(_("rebase completed\n")) | ||
|
r18386 | util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | ||
|
r6906 | if skipped: | ||
ui.note(_("%d revisions have been skipped\n") % len(skipped)) | ||||
|
r17046 | |||
if (activebookmark and | ||||
|
r19926 | repo['.'].node() == repo._bookmarks[activebookmark]): | ||
|
r24945 | bookmarks.activate(repo, activebookmark) | ||
|
r17046 | |||
|
r6906 | finally: | ||
|
r8112 | release(lock, wlock) | ||
|
r6906 | |||
|
r28136 | def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=[]): | ||
"""use revisions argument to define destination and rebase set | ||||
""" | ||||
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) | ||||
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: | ||
dest = repo[_destrebase(repo, base)] | ||||
destf = str(dest) | ||||
|
r28136 | commonanc = repo.revs('ancestor(%ld, %d)', base, dest).first() | ||
if commonanc is not None: | ||||
rebaseset = repo.revs('(%d::(%ld) - %d)::', | ||||
commonanc, base, commonanc) | ||||
else: | ||||
rebaseset = [] | ||||
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: | ||||
dest = repo[_destrebase(repo, rebaseset)] | ||||
destf = str(dest) | ||||
|
r28136 | return dest, rebaseset | ||
|
r19955 | def externalparent(repo, state, targetancestors): | ||
"""Return the revision that should be used as the second parent | ||||
when the revisions in state is collapsed on top of targetancestors. | ||||
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 | ||||
and p.rev() not in targetancestors): | ||||
|
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') % | ||
(max(targetancestors), | ||||
', '.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.''' | ||
|
r24998 | dsguard = cmdutil.dirstateguard(repo, 'rebase') | ||
|
r6906 | try: | ||
|
r16551 | repo.setparents(repo[p1].node(), repo[p2].node()) | ||
|
r11537 | ctx = repo[rev] | ||
|
r10351 | if commitmsg is None: | ||
|
r11537 | commitmsg = ctx.description() | ||
|
r26360 | keepbranch = keepbranches and repo[p1].branch() != ctx.branch() | ||
|
r27977 | extra = {'rebase_source': ctx.hex()} | ||
|
r10762 | if extrafn: | ||
extrafn(ctx, extra) | ||||
|
r22038 | |||
backup = repo.ui.backupconfig('phases', 'new-commit') | ||||
try: | ||||
targetphase = max(ctx.phase(), phases.draft) | ||||
repo.ui.setconfig('phases', 'new-commit', targetphase, 'rebase') | ||||
|
r26360 | if keepbranch: | ||
repo.ui.setconfig('ui', 'allowemptycommit', True) | ||||
|
r22038 | # Commit might fail if unresolved files exist | ||
|
r26868 | if date is None: | ||
date = ctx.date() | ||||
|
r23459 | newnode = repo.commit(text=commitmsg, user=ctx.user(), | ||
|
r26868 | date=date, extra=extra, editor=editor) | ||
|
r22038 | finally: | ||
repo.ui.restoreconfig(backup) | ||||
|
r23459 | repo.dirstate.setbranch(repo[newnode].branch()) | ||
|
r24998 | dsguard.close() | ||
|
r23459 | return newnode | ||
|
r24998 | finally: | ||
release(dsguard) | ||||
|
r6906 | |||
|
r23484 | def rebasenode(repo, rev, p1, base, state, collapse, target): | ||
'Rebase a single revision rev on top of p1 using base as merge ancestor' | ||||
|
r6906 | # Merge phase | ||
|
r10351 | # Update to target and merge it with local | ||
|
r23461 | if repo['.'].rev() != p1: | ||
repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | ||||
|
r27344 | merge.update(repo, p1, False, True) | ||
|
r6906 | else: | ||
|
r10351 | repo.ui.debug(" already in target\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. | ||||
|
r27344 | stats = merge.update(repo, rev, True, True, base, collapse, | ||
|
r21526 | labels=['dest', 'source']) | ||
|
r22905 | if collapse: | ||
copies.duplicatecopies(repo, rev, target) | ||||
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() | ||||
copies.duplicatecopies(repo, rev, p1rev, skiprev=target) | ||||
return stats | ||||
|
r6923 | |||
|
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 | ||||
|
r6906 | def defineparents(repo, rev, target, state, targetancestors): | ||
'Return the new parent relationship of the revision that will be rebased' | ||||
parents = repo[rev].parents() | ||||
p1 = p2 = nullrev | ||||
|
r22906 | p1n = parents[0].rev() | ||
if p1n in targetancestors: | ||||
|
r6906 | p1 = target | ||
|
r22906 | elif p1n in state: | ||
if state[p1n] == nullmerge: | ||||
|
r10352 | p1 = target | ||
|
r27014 | elif state[p1n] in revskipped: | ||
|
r22906 | p1 = nearestrebased(repo, p1n, state) | ||
|
r18447 | if p1 is None: | ||
p1 = target | ||||
|
r10352 | else: | ||
|
r22906 | p1 = state[p1n] | ||
else: # p1n external | ||||
|
r6906 | p1 = target | ||
|
r22906 | p2 = p1n | ||
|
r6906 | |||
if len(parents) == 2 and parents[1].rev() not in targetancestors: | ||||
|
r22906 | p2n = parents[1].rev() | ||
|
r6906 | # interesting second parent | ||
|
r22906 | if p2n in state: | ||
if p1 == target: # p1n in targetancestors or external | ||||
p1 = state[p2n] | ||||
|
r27014 | elif state[p2n] in revskipped: | ||
|
r22906 | p2 = nearestrebased(repo, p2n, state) | ||
|
r18447 | if p2 is None: | ||
# no ancestors rebased yet, detach | ||||
p2 = target | ||||
|
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" % | ||
(repo[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. | ||||
|
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)') | ||||
return 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 | |||
|
r27059 | def updatebookmarks(repo, targetnode, nstate, originalbookmarks, tr): | ||
|
r18514 | 'Move bookmarks to their correct changesets, and delete divergent ones' | ||
|
r17922 | marks = repo._bookmarks | ||
|
r14884 | for k, v in originalbookmarks.iteritems(): | ||
if v in nstate: | ||||
|
r18512 | # update the bookmarks for revs that have moved | ||
marks[k] = nstate[v] | ||||
|
r18549 | bookmarks.deletedivergent(repo, [targetnode], k) | ||
|
r27059 | marks.recordchange(tr) | ||
|
r14884 | |||
|
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' | ||||
util.unlinkpath(repo.join("last-message.txt"), ignoremissing=True) | ||||
def restorecollapsemsg(repo): | ||||
'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 | ||||
raise error.Abort(_('no rebase in progress')) | ||||
return collapsemsg | ||||
|
r7952 | def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, | ||
|
r18755 | external, activebookmark): | ||
|
r6906 | 'Store the current status to allow recovery' | ||
|
r23877 | f = repo.vfs("rebasestate", "w") | ||
|
r6906 | f.write(repo[originalwd].hex() + '\n') | ||
f.write(repo[target].hex() + '\n') | ||||
f.write(repo[external].hex() + '\n') | ||||
f.write('%d\n' % int(collapse)) | ||||
|
r7952 | f.write('%d\n' % int(keep)) | ||
f.write('%d\n' % int(keepbranches)) | ||||
|
r18755 | f.write('%s\n' % (activebookmark or '')) | ||
|
r7622 | for d, v in state.iteritems(): | ||
|
r6906 | oldrev = repo[d].hex() | ||
|
r23491 | if v >= 0: | ||
|
r15464 | newrev = repo[v].hex() | ||
|
r23491 | 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) | ||||
|
r15464 | else: | ||
newrev = v | ||||
|
r6906 | f.write("%s:%s\n" % (oldrev, newrev)) | ||
f.close() | ||||
|
r9467 | repo.ui.debug('rebase status stored\n') | ||
|
r6906 | |||
def clearstatus(repo): | ||||
'Remove the status files' | ||||
|
r23970 | _clearrebasesetvisibiliy(repo) | ||
|
r18386 | util.unlinkpath(repo.join("rebasestate"), ignoremissing=True) | ||
|
r6906 | |||
def restorestatus(repo): | ||||
'Restore a previously stored status' | ||||
|
r26745 | keepbranches = None | ||
target = None | ||||
collapse = False | ||||
external = nullrev | ||||
activebookmark = None | ||||
state = {} | ||||
|
r6906 | try: | ||
|
r23877 | f = repo.vfs("rebasestate") | ||
|
r6906 | for i, l in enumerate(f.read().splitlines()): | ||
if i == 0: | ||||
originalwd = repo[l].rev() | ||||
elif i == 1: | ||||
target = repo[l].rev() | ||||
elif i == 2: | ||||
external = repo[l].rev() | ||||
elif i == 3: | ||||
collapse = bool(int(l)) | ||||
|
r7952 | elif i == 4: | ||
keep = bool(int(l)) | ||||
elif i == 5: | ||||
keepbranches = bool(int(l)) | ||||
|
r18755 | 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 | ||||
|
r6906 | else: | ||
oldrev, newrev = l.split(':') | ||||
|
r26349 | if newrev in (str(nullmerge), str(revignored), | ||
|
r27012 | str(revprecursor), str(revpruned)): | ||
|
r18447 | state[repo[oldrev].rev()] = int(newrev) | ||
|
r23491 | elif newrev == nullid: | ||
state[repo[oldrev].rev()] = revtodo | ||||
# Legacy compat special case | ||||
|
r18447 | else: | ||
|
r15464 | state[repo[oldrev].rev()] = repo[newrev].rev() | ||
|
r20327 | |||
|
r25660 | except IOError as err: | ||
|
r6906 | if err.errno != errno.ENOENT: | ||
raise | ||||
|
r28122 | cmdutil.wrongtooltocontinue(repo, _('rebase')) | ||
|
r6906 | |||
|
r26745 | if keepbranches is None: | ||
raise error.Abort(_('.hg/rebasestate is incomplete')) | ||||
skipped = set() | ||||
# recompute the set of skipped revs | ||||
if not collapse: | ||||
seen = set([target]) | ||||
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') | ||||
_setrebasesetvisibility(repo, state.keys()) | ||||
return (originalwd, target, state, skipped, | ||||
collapse, keep, keepbranches, external, activebookmark) | ||||
|
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 | ||||
|
r24758 | def abort(repo, originalwd, target, state, activebookmark=None): | ||
'''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, | ||||
# their values within the state mapping will be the target rev id. The | ||||
# dstates list must must not contain the target rev (issue4896) | ||||
dstates = [s for s in state.values() if s >= 0 and s != target] | ||||
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), | ||||
hint=_('see "hg help phases" for details')) | ||||
cleanup = False | ||||
|
r16280 | |||
|
r26744 | descendants = set() | ||
if dstates: | ||||
descendants = set(repo.changelog.descendants(dstates)) | ||||
if descendants - set(dstates): | ||||
repo.ui.warn(_("warning: new changesets detected on target branch, " | ||||
"can't strip\n")) | ||||
cleanup = False | ||||
|
r19518 | |||
|
r26744 | if cleanup: | ||
|
r27988 | shouldupdate = False | ||
rebased = filter(lambda x: x >= 0 and x != target, state.values()) | ||||
if rebased: | ||||
strippoints = [ | ||||
c.node() for c in repo.set('roots(%ld)', rebased)] | ||||
shouldupdate = len([ | ||||
c.node() for c in repo.set('. & (%ld)', rebased)]) > 0 | ||||
|
r26744 | # Update away from the rebase if necessary | ||
|
r27988 | if shouldupdate or needupdate(repo, state): | ||
|
r27344 | merge.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 | ''' | ||
|
r23970 | _setrebasesetvisibility(repo, rebaseset) | ||
|
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() | ||
state = {} | ||||
detachset = set() | ||||
for root in roots: | ||||
commonbase = root.ancestor(dest) | ||||
if commonbase == root: | ||||
|
r26587 | raise error.Abort(_('source is ancestor of destination')) | ||
|
r18424 | if commonbase == dest: | ||
samebranch = root.branch() == dest.branch() | ||||
if not collapse and samebranch and root in dest.children(): | ||||
repo.ui.debug('source is a child of destination\n') | ||||
return None | ||||
|
r6906 | |||
|
r20545 | repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root)) | ||
|
r23490 | state.update(dict.fromkeys(rebaseset, revtodo)) | ||
|
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()])) | ||||
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 | ||||
|
r15267 | return repo['.'].rev(), dest.rev(), state | ||
|
r6906 | |||
|
r18444 | def clearrebased(ui, repo, 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.""" | ||||
|
r22951 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | ||
|
r17612 | markers = [] | ||
for rev, newrev in sorted(state.items()): | ||||
if newrev >= 0: | ||||
|
r18444 | if rev in skipped: | ||
succs = () | ||||
elif collapsedas is not None: | ||||
succs = (repo[collapsedas],) | ||||
else: | ||||
succs = (repo[newrev],) | ||||
markers.append((repo[rev], succs)) | ||||
|
r17612 | if markers: | ||
obsolete.createmarkers(repo, markers) | ||||
else: | ||||
|
r18446 | rebased = [rev for rev in state if state[rev] > nullmerge] | ||
|
r17612 | if rebased: | ||
|
r18424 | stripped = [] | ||
for root in repo.set('roots(%ld)', rebased): | ||||
if set(repo.changelog.descendants([root.rev()])) - set(state): | ||||
ui.warn(_("warning: new changesets detected " | ||||
"on source branch, not stripping\n")) | ||||
else: | ||||
stripped.append(root.node()) | ||||
if stripped: | ||||
|
r17612 | # backup the old csets by default | ||
|
r18424 | repair.strip(ui, repo, stripped, "all") | ||
|
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'): | ||
|
r26029 | wlock = lock = None | ||
try: | ||||
wlock = repo.wlock() | ||||
lock = repo.lock() | ||||
if opts.get('update'): | ||||
del opts['update'] | ||||
ui.debug('--update and --rebase are not compatible, ignoring ' | ||||
'the update flag\n') | ||||
|
r6906 | |||
|
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'] | ||||
|
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) | ||||
|
r10628 | finally: | ||
|
r26029 | release(lock, wlock) | ||
|
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 | ||||
hidden (see issue4505)""" | ||||
repo = repo.unfiltered() | ||||
revs = set(revs) | ||||
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): | ||||
"""ensure rebased revs stay visible (see issue4505)""" | ||||
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 | ||
obsolete => None entries in the mapping indicate nodes with no succesor""" | ||||
|
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) | ||||
for s in obsolete.allsuccessors(repo.obsstore, [node]): | ||||
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 | ||||
|
r26674 | ancs = cl.ancestors([repo[dest].rev()], | ||
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): | ||
if not os.path.exists(repo.join('rebasestate')): | ||||
return | ||||
|
r19849 | try: | ||
state = restorestatus(repo)[2] | ||||
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 | ||
extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) | ||||