rebase.py
970 lines
| 39.2 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: | ||||
|
r9301 | http://mercurial.selenic.com/wiki/RebaseExtension | ||
|
r6906 | ''' | ||
|
r14884 | from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks | ||
|
r18933 | from mercurial import extensions, patch, scmutil, phases, obsolete, error | ||
|
r6906 | from mercurial.commands import templateopts | ||
from mercurial.node import nullrev | ||||
|
r8112 | from mercurial.lock import release | ||
|
r6906 | from mercurial.i18n import _ | ||
import os, errno | ||||
|
r10352 | nullmerge = -2 | ||
|
r18447 | revignored = -3 | ||
|
r10352 | |||
|
r14306 | cmdtable = {} | ||
command = cmdutil.command(cmdtable) | ||||
|
r16743 | testedwith = 'internal' | ||
|
r14306 | |||
|
r19861 | def _savegraft(ctx, extra): | ||
s = ctx.extra().get('source', None) | ||||
if s is not None: | ||||
extra['source'] = s | ||||
|
r19860 | def _savebranch(ctx, extra): | ||
extra['branch'] = ctx.branch() | ||||
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 | ||||
|
r14306 | @command('rebase', | ||
[('s', 'source', '', | ||||
_('rebase from the specified changeset'), _('REV')), | ||||
('b', 'base', '', | ||||
_('rebase from the base of the specified changeset ' | ||||
'(up to greatest common ancestor of base and dest)'), | ||||
_('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')), | ||||
('', 'keep', False, _('keep original changesets')), | ||||
('', 'keepbranches', False, _('keep original branch names')), | ||||
|
r17005 | ('D', 'detach', 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. | ||
|
r11188 | You should not rebase changesets that have already been shared | ||
with others. Doing so will force everybody else to perform the | ||||
same rebase or they will end up with duplicated changesets after | ||||
pulling in your rebased changesets. | ||||
|
r18516 | In its default configuration, Mercurial will prevent you from | ||
rebasing published changes. See :hg:`help phases` for details. | ||||
|
r10646 | If you don't specify a destination changeset (``-d/--dest``), | ||
|
r19398 | rebase uses the current branch tip as the destination. (The | ||
destination changeset is not modified by rebasing, but new | ||||
changesets are added as its descendants.) | ||||
|
r10646 | |||
You can specify which changesets to rebase in two ways: as a | ||||
|
r10659 | "source" changeset or as a "base" changeset. Both are shorthand | ||
for a topologically related set of changesets (the "source | ||||
branch"). If you specify source (``-s/--source``), rebase will | ||||
rebase that changeset and all of its descendants onto dest. If you | ||||
specify base (``-b/--base``), rebase will select ancestors of base | ||||
back to but not including the common ancestor with dest. Thus, | ||||
``-b`` is less precise but more convenient than ``-s``: you can | ||||
specify any changeset in the source branch, and rebase will select | ||||
the whole branch. If you specify neither ``-s`` nor ``-b``, rebase | ||||
uses the parent of the working directory as the base. | ||||
|
r10646 | |||
|
r18518 | For advanced usage, a third way is available through the ``--rev`` | ||
option. It allows you to specify an arbitrary set of changesets to | ||||
rebase. Descendants of revs you specify with this option are not | ||||
automatically included in the rebase. | ||||
|
r10646 | By default, rebase recreates the changesets in the source branch | ||
as descendants of dest and then destroys the originals. Use | ||||
``--keep`` to preserve the original source changesets. Some | ||||
changesets in the source branch (e.g. merges from the destination | ||||
branch) may be dropped if they no longer contribute any change. | ||||
One result of the rules for selecting the destination changeset | ||||
and source branch is that, unlike ``merge``, rebase will do | ||||
|
r19398 | nothing if you are at the branch tip of a named branch | ||
|
r10646 | with two heads. You need to explicitly specify source and/or | ||
destination (or ``update`` to the other head, if it's the head of | ||||
the intended source branch). | ||||
|
r6906 | |||
|
r7999 | If a rebase is interrupted to manually resolve a merge, it can be | ||
|
r8076 | continued with --continue/-c or aborted with --abort/-a. | ||
|
r11205 | |||
|
r19971 | Returns 0 on success, 1 if nothing to rebase or there are | ||
unresolved conflicts. | ||||
|
r6906 | """ | ||
|
r7280 | originalwd = target = None | ||
|
r18755 | activebookmark = None | ||
|
r6906 | external = nullrev | ||
|
r8454 | state = {} | ||
skipped = set() | ||||
|
r10351 | targetancestors = set() | ||
|
r6906 | |||
|
r21410 | editor = cmdutil.getcommiteditor(**opts) | ||
|
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) | ||
|
r19860 | e = opts.get('extrafn') # internal, used by e.g. hgsubversion | ||
|
r19861 | 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 | |||
|
r13661 | if collapsemsg and not collapsef: | ||
raise util.Abort( | ||||
_('message can only be specified with collapse')) | ||||
|
r6906 | if contf or abortf: | ||
if contf and abortf: | ||||
|
r11285 | raise util.Abort(_('cannot use both abort and continue')) | ||
|
r6906 | if collapsef: | ||
|
r11285 | raise util.Abort( | ||
_('cannot use collapse with continue or abort')) | ||||
|
r8117 | if srcf or basef or destf: | ||
|
r11285 | raise util.Abort( | ||
|
r6906 | _('abort and continue do not allow specifying revisions')) | ||
|
r13856 | if opts.get('tool', False): | ||
ui.warn(_('tool option will be ignored\n')) | ||||
|
r6906 | |||
|
r19848 | try: | ||
(originalwd, target, state, skipped, collapsef, keepf, | ||||
keepbranchesf, external, activebookmark) = restorestatus(repo) | ||||
except error.RepoLookupError: | ||||
if abortf: | ||||
clearstatus(repo) | ||||
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') | ||
|
r19848 | raise util.Abort(msg, hint=hint) | ||
|
r6906 | if abortf: | ||
|
r11205 | return abort(repo, originalwd, target, state) | ||
|
r6906 | else: | ||
if srcf and basef: | ||||
|
r11285 | raise util.Abort(_('cannot specify both a ' | ||
|
r15270 | 'source and a base')) | ||
if revf and basef: | ||||
|
r15289 | raise util.Abort(_('cannot specify both a ' | ||
|
r11285 | 'revision and a base')) | ||
|
r15270 | if revf and srcf: | ||
|
r15289 | raise util.Abort(_('cannot specify both a ' | ||
|
r15270 | 'revision and a source')) | ||
|
r10352 | |||
|
r19478 | cmdutil.checkunfinished(repo) | ||
|
r14289 | cmdutil.bailifchanged(repo) | ||
|
r15267 | |||
if not destf: | ||||
|
r15270 | # Destination defaults to the latest revision in the | ||
# current branch | ||||
|
r15267 | branch = repo[None].branch() | ||
dest = repo[branch] | ||||
else: | ||||
|
r16566 | dest = scmutil.revsingle(repo, destf) | ||
|
r15267 | |||
|
r15271 | if revf: | ||
|
r19641 | rebaseset = scmutil.revrange(repo, revf) | ||
|
r20247 | if not rebaseset: | ||
|
r21197 | ui.status(_('empty "rev" revision set - ' | ||
'nothing to rebase\n')) | ||||
return 1 | ||||
|
r15271 | elif srcf: | ||
|
r15800 | src = scmutil.revrange(repo, [srcf]) | ||
|
r20248 | if not src: | ||
|
r21210 | ui.status(_('empty "source" revision set - ' | ||
'nothing to rebase\n')) | ||||
return 1 | ||||
|
r15801 | rebaseset = repo.revs('(%ld)::', src) | ||
|
r20248 | assert rebaseset | ||
|
r15267 | else: | ||
|
r15800 | base = scmutil.revrange(repo, [basef or '.']) | ||
|
r20249 | if not base: | ||
|
r21210 | ui.status(_('empty "base" revision set - ' | ||
"can't compute rebase set\n")) | ||||
return 1 | ||||
|
r15801 | rebaseset = repo.revs( | ||
'(children(ancestor(%ld, %d)) and ::(%ld))::', | ||||
|
r15404 | base, dest, base) | ||
|
r20249 | if not rebaseset: | ||
if 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 1 | ||||
|
r15271 | |||
|
r20250 | if (not (keepf or obsolete._enabled) | ||
|
r18269 | and repo.revs('first(children(%ld) - %ld)', | ||
|
r18164 | rebaseset, rebaseset)): | ||
|
r15272 | raise util.Abort( | ||
_("can't remove original changesets with" | ||||
" unrebased descendants"), | ||||
hint=_('use --keep to keep original changesets')) | ||||
|
r20250 | result = buildstate(repo, dest, rebaseset, collapsef) | ||
|
r10351 | if not result: | ||
# Empty state built, nothing to rebase | ||||
|
r8615 | ui.status(_('nothing to rebase\n')) | ||
|
r11205 | return 1 | ||
|
r20250 | |||
root = min(rebaseset) | ||||
if not keepf and not repo[root].mutable(): | ||||
|
r19059 | raise util.Abort(_("can't rebase immutable changeset %s") | ||
% repo[root], | ||||
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) | ||||
|
r7952 | if keepbranchesf: | ||
|
r19860 | # 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) | ||||
|
r14897 | if collapsef: | ||
branches = set() | ||||
for rev in state: | ||||
branches.add(repo[rev].branch()) | ||||
if len(branches) > 1: | ||||
|
r14917 | raise util.Abort(_('cannot collapse multiple named ' | ||
|
r14897 | 'branches')) | ||
|
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() | ||||
|
r18755 | activebookmark = activebookmark or repo._bookmarkcurrent | ||
|
r17046 | if activebookmark: | ||
bookmarks.unsetcurrent(repo) | ||||
|
r14884 | |||
|
r19860 | extrafn = _makeextrafn(extrafns) | ||
|
r11729 | sortedstate = sorted(state) | ||
total = len(sortedstate) | ||||
pos = 0 | ||||
for rev in sortedstate: | ||||
pos += 1 | ||||
|
r6906 | if state[rev] == -1: | ||
|
r11761 | ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), | ||
|
r12744 | _('changesets'), total) | ||
|
r19477 | p1, p2 = defineparents(repo, rev, target, state, | ||
targetancestors) | ||||
|
r7952 | storestatus(repo, originalwd, target, state, collapsef, keepf, | ||
|
r18755 | keepbranchesf, external, activebookmark) | ||
|
r10351 | if len(repo.parents()) == 2: | ||
repo.ui.debug('resuming interrupted rebase\n') | ||||
else: | ||||
|
r13856 | try: | ||
|
r20790 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ||
'rebase') | ||||
|
r16696 | stats = rebasenode(repo, rev, p1, state, collapsef) | ||
|
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') | ||
|
r21826 | if collapsef: | ||
cmdutil.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() | ||||
cmdutil.duplicatecopies(repo, rev, p1rev, skiprev=target) | ||||
|
r10351 | if not collapsef: | ||
|
r15219 | newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, | ||
editor=editor) | ||||
|
r10351 | else: | ||
# Skip commit if we are collapsing | ||||
|
r16551 | repo.setparents(repo[p1].node()) | ||
|
r10351 | newrev = None | ||
# Update the state | ||||
if newrev is not None: | ||||
state[rev] = repo[newrev].rev() | ||||
else: | ||||
if not collapsef: | ||||
ui.note(_('no changes, revision %d skipped\n') % rev) | ||||
ui.debug('next revision set to %s\n' % p1) | ||||
skipped.add(rev) | ||||
state[rev] = p1 | ||||
|
r11729 | ui.progress(_('rebasing'), None) | ||
|
r6906 | ui.note(_('rebase merging completed\n')) | ||
|
r10677 | if collapsef and not keepopen: | ||
|
r6923 | p1, p2 = defineparents(repo, min(state), target, | ||
|
r6906 | state, targetancestors) | ||
|
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() | ||
|
r21410 | editor = cmdutil.getcommiteditor(edit=True) | ||
|
r10352 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, | ||
|
r15219 | extrafn=extrafn, editor=editor) | ||
|
r19986 | for oldrev in state.iterkeys(): | ||
if state[oldrev] > nullmerge: | ||||
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) | ||||
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: | ||||
collapsedas = newrev | ||||
|
r18444 | clearrebased(ui, repo, state, skipped, collapsedas) | ||
|
r6906 | |||
|
r14884 | if currentbookmarks: | ||
|
r18549 | updatebookmarks(repo, targetnode, nstate, currentbookmarks) | ||
|
r20523 | if activebookmark not in repo._bookmarks: | ||
# active bookmark was divergent one and has been deleted | ||||
activebookmark = None | ||||
|
r14884 | |||
|
r6906 | clearstatus(repo) | ||
|
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]): | ||
|
r17046 | bookmarks.setcurrent(repo, activebookmark) | ||
|
r6906 | finally: | ||
|
r8112 | release(lock, wlock) | ||
|
r6906 | |||
|
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() | ||||
|
r19956 | raise util.Abort(_('unable to collapse on top of %s, there is more ' | ||
'than one external parent: %s') % | ||||
(max(targetancestors), | ||||
', '.join(str(p) for p in sorted(parents)))) | ||||
|
r10351 | |||
|
r15219 | def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None): | ||
|
r10351 | 'Commit the changes and store useful information in extra' | ||
|
r6906 | try: | ||
|
r16551 | repo.setparents(repo[p1].node(), repo[p2].node()) | ||
|
r11537 | ctx = repo[rev] | ||
|
r10351 | if commitmsg is None: | ||
|
r11537 | commitmsg = ctx.description() | ||
|
r10762 | extra = {'rebase_source': ctx.hex()} | ||
if extrafn: | ||||
extrafn(ctx, extra) | ||||
|
r6906 | # Commit might fail if unresolved files exist | ||
|
r10762 | newrev = repo.commit(text=commitmsg, user=ctx.user(), | ||
|
r15219 | date=ctx.date(), extra=extra, editor=editor) | ||
|
r8266 | repo.dirstate.setbranch(repo[newrev].branch()) | ||
|
r15917 | targetphase = max(ctx.phase(), phases.draft) | ||
# retractboundary doesn't overwrite upper phase inherited from parent | ||||
newnode = repo[newrev].node() | ||||
|
r15923 | if newnode: | ||
phases.retractboundary(repo, targetphase, [newnode]) | ||||
|
r6906 | return newrev | ||
except util.Abort: | ||||
# Invalidate the previous setparents | ||||
repo.dirstate.invalidate() | ||||
raise | ||||
|
r16696 | def rebasenode(repo, rev, p1, state, collapse): | ||
|
r6906 | 'Rebase a single revision' | ||
# Merge phase | ||||
|
r10351 | # Update to target and merge it with local | ||
if repo['.'].rev() != repo[p1].rev(): | ||||
repo.ui.debug(" update to %d:%s\n" % (repo[p1].rev(), repo[p1])) | ||||
merge.update(repo, p1, False, True, False) | ||||
|
r6906 | else: | ||
|
r10351 | repo.ui.debug(" already in target\n") | ||
repo.dirstate.write() | ||||
repo.ui.debug(" merge against %d:%s\n" % (repo[rev].rev(), repo[rev])) | ||||
|
r19969 | if repo[rev].rev() == repo[min(state)].rev(): | ||
# Case (1) initial changeset of a non-detaching rebase. | ||||
# 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 | ||||
|
r13878 | base = repo[rev].p1().node() | ||
|
r19969 | else: | ||
# In case of merge, we need to pick the right parent as merge base. | ||||
# | ||||
# Imagine we have: | ||||
# - M: currently rebase revision in this step | ||||
# - A: one parent of M | ||||
# - B: second parent of M | ||||
# - D: destination of this merge step (p1 var) | ||||
# | ||||
# If we are rebasing on D, D is the successors of A or B. The right | ||||
# merge base is the one D succeed to. We pretend it is B for the rest | ||||
# of this comment | ||||
# | ||||
# 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. | ||||
# | ||||
# If we pick the A as the base, the merge involves | ||||
# - 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 | ||||
# conflicts. | ||||
for p in repo[rev].parents(): | ||||
if state.get(p.rev()) == repo[p1].rev(): | ||||
base = p.node() | ||||
break | ||||
|
r20597 | 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 ' | ||||
'(rebasenode called wrong)') | ||||
|
r19969 | if base is not None: | ||
repo.ui.debug(" detach base %d:%s\n" % (repo[base].rev(), repo[base])) | ||||
|
r16696 | # When collapsing in-place, the parent is the common ancestor, we | ||
# have to allow merging with it. | ||||
|
r21526 | return merge.update(repo, rev, True, True, False, base, collapse, | ||
labels=['dest', 'source']) | ||||
|
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: | ||||
return state[candidates[0]] | ||||
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 | ||||
P1n = parents[0].rev() | ||||
if P1n in targetancestors: | ||||
p1 = target | ||||
elif P1n in state: | ||||
|
r10352 | if state[P1n] == nullmerge: | ||
p1 = target | ||||
|
r18447 | elif state[P1n] == revignored: | ||
p1 = nearestrebased(repo, P1n, state) | ||||
if p1 is None: | ||||
p1 = target | ||||
|
r10352 | else: | ||
p1 = state[P1n] | ||||
|
r6906 | else: # P1n external | ||
p1 = target | ||||
p2 = P1n | ||||
if len(parents) == 2 and parents[1].rev() not in targetancestors: | ||||
P2n = parents[1].rev() | ||||
# interesting second parent | ||||
if P2n in state: | ||||
if p1 == target: # P1n in targetancestors or external | ||||
p1 = state[P2n] | ||||
|
r18447 | elif state[P2n] == revignored: | ||
p2 = nearestrebased(repo, P2n, state) | ||||
if p2 is None: | ||||
# no ancestors rebased yet, detach | ||||
p2 = target | ||||
|
r6906 | else: | ||
p2 = state[P2n] | ||||
else: # P2n external | ||||
if p2 != nullrev: # P1n external too => rev is a merged revision | ||||
raise util.Abort(_('cannot use revision %d as base, result ' | ||||
'would have 3 parents') % rev) | ||||
p2 = P2n | ||||
|
r10351 | repo.ui.debug(" future parents are %d and %d\n" % | ||
(repo[p1].rev(), repo[p2].rev())) | ||||
|
r6906 | return p1, p2 | ||
|
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] | ||
repo.ui.debug('import mq patch %d (%s)\n' % (state[rev], name)) | ||||
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 | |||
|
r18549 | def updatebookmarks(repo, targetnode, nstate, originalbookmarks): | ||
|
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) | ||
|
r14884 | |||
|
r17922 | marks.write() | ||
|
r14884 | |||
|
r7952 | def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, | ||
|
r18755 | external, activebookmark): | ||
|
r6906 | 'Store the current status to allow recovery' | ||
f = repo.opener("rebasestate", "w") | ||||
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() | ||
|
r18446 | if v > nullmerge: | ||
|
r15464 | newrev = repo[v].hex() | ||
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' | ||||
|
r18386 | util.unlinkpath(repo.join("rebasestate"), ignoremissing=True) | ||
|
r6906 | |||
def restorestatus(repo): | ||||
'Restore a previously stored status' | ||||
try: | ||||
|
r20327 | keepbranches = None | ||
|
r6906 | target = None | ||
collapse = False | ||||
external = nullrev | ||||
|
r18755 | activebookmark = None | ||
|
r6906 | state = {} | ||
f = repo.opener("rebasestate") | ||||
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(':') | ||||
|
r18447 | if newrev in (str(nullmerge), str(revignored)): | ||
state[repo[oldrev].rev()] = int(newrev) | ||||
else: | ||||
|
r15464 | state[repo[oldrev].rev()] = repo[newrev].rev() | ||
|
r20327 | |||
if keepbranches is None: | ||||
raise util.Abort(_('.hg/rebasestate is incomplete')) | ||||
|
r11843 | skipped = set() | ||
# recompute the set of skipped revs | ||||
if not collapse: | ||||
seen = set([target]) | ||||
for old, new in sorted(state.items()): | ||||
if new != nullrev and new in seen: | ||||
skipped.add(old) | ||||
seen.add(new) | ||||
|
r20546 | repo.ui.debug('computed skipped revs: %s\n' % | ||
(' '.join(str(r) for r in sorted(skipped)) or None)) | ||||
|
r9467 | repo.ui.debug('rebase status resumed\n') | ||
|
r11843 | return (originalwd, target, state, skipped, | ||
|
r18755 | collapse, keep, keepbranches, external, activebookmark) | ||
|
r6906 | except IOError, err: | ||
if err.errno != errno.ENOENT: | ||||
raise | ||||
raise util.Abort(_('no rebase in progress')) | ||||
|
r19516 | def inrebase(repo, originalwd, state): | ||
|
r19951 | '''check whether the working dir is in an interrupted rebase''' | ||
|
r19516 | parents = [p.rev() for p in repo.parents()] | ||
if originalwd in parents: | ||||
return True | ||||
for newrev in state.itervalues(): | ||||
if newrev in parents: | ||||
return True | ||||
return False | ||||
|
r6906 | def abort(repo, originalwd, target, state): | ||
'Restore the repository to its original state' | ||||
|
r19984 | dstates = [s for s in state.values() if s > nullrev] | ||
|
r17026 | immutable = [d for d in dstates if not repo[d].mutable()] | ||
|
r19518 | cleanup = True | ||
|
r17026 | if immutable: | ||
|
r19517 | repo.ui.warn(_("warning: can't clean up immutable changesets %s\n") | ||
% ', '.join(str(repo[r]) for r in immutable), | ||||
hint=_('see hg help phases for details')) | ||||
|
r19518 | cleanup = False | ||
|
r16280 | |||
descendants = set() | ||||
if dstates: | ||||
|
r16867 | descendants = set(repo.changelog.descendants(dstates)) | ||
|
r16280 | if descendants - set(dstates): | ||
|
r6906 | repo.ui.warn(_("warning: new changesets detected on target branch, " | ||
|
r19518 | "can't strip\n")) | ||
cleanup = False | ||||
if cleanup: | ||||
|
r19516 | # Update away from the rebase if necessary | ||
|
r19518 | if inrebase(repo, originalwd, state): | ||
|
r19516 | merge.update(repo, repo[originalwd].rev(), False, True, False) | ||
|
r6906 | # Strip from the first rebased revision | ||
|
r11316 | rebased = filter(lambda x: x > -1 and x != target, state.values()) | ||
|
r19518 | if rebased: | ||
|
r18424 | strippoints = [c.node() for c in repo.set('roots(%ld)', rebased)] | ||
|
r11201 | # no backup of rebased cset versions needed | ||
|
r18424 | repair.strip(repo.ui, repo, strippoints) | ||
|
r19518 | |||
clearstatus(repo) | ||||
repo.ui.warn(_('rebase aborted\n')) | ||||
return 0 | ||||
|
r6906 | |||
|
r17005 | def buildstate(repo, dest, rebaseset, collapse): | ||
|
r15267 | '''Define which revisions are going to be rebased and where | ||
|
r6906 | |||
|
r15267 | repo: repo | ||
dest: context | ||||
rebaseset: set of rev | ||||
|
r17005 | ''' | ||
|
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]): | ||
|
r10672 | raise util.Abort(_('cannot rebase onto an applied mq patch')) | ||
|
r15267 | roots = list(repo.set('roots(%ld)', rebaseset)) | ||
if not roots: | ||||
|
r15270 | raise util.Abort(_('no matching revisions')) | ||
|
r18424 | roots.sort() | ||
state = {} | ||||
detachset = set() | ||||
for root in roots: | ||||
commonbase = root.ancestor(dest) | ||||
if commonbase == root: | ||||
raise util.Abort(_('source is ancestor of destination')) | ||||
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)) | ||
|
r18424 | state.update(dict.fromkeys(rebaseset, nullrev)) | ||
# 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 | ||||
|
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.""" | ||||
|
r17612 | if obsolete._enabled: | ||
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' | ||
if opts.get('rebase'): | ||||
if opts.get('update'): | ||||
|
r8242 | del opts['update'] | ||
|
r9467 | ui.debug('--update and --rebase are not compatible, ignoring ' | ||
'the update flag\n') | ||||
|
r6906 | |||
|
r16228 | movemarkfrom = repo['.'].node() | ||
|
r6906 | revsprepull = len(repo) | ||
|
r10628 | origpostincoming = commands.postincoming | ||
def _dummy(*args, **kwargs): | ||||
pass | ||||
commands.postincoming = _dummy | ||||
try: | ||||
orig(ui, repo, *args, **opts) | ||||
finally: | ||||
commands.postincoming = origpostincoming | ||||
|
r6906 | revspostpull = len(repo) | ||
if revspostpull > revsprepull: | ||||
|
r17988 | # --rev option from pull conflict with rebase own --rev | ||
# dropping it | ||||
if 'rev' in opts: | ||||
del opts['rev'] | ||||
|
r7216 | rebase(ui, repo, **opts) | ||
|
r7786 | branch = repo[None].branch() | ||
dest = repo[branch].rev() | ||||
if dest != repo['.'].rev(): | ||||
# there was nothing to rebase we force an update | ||||
|
r10628 | hg.update(repo, dest) | ||
|
r16228 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | ||
ui.status(_("updating bookmark %s\n") | ||||
% repo._bookmarkcurrent) | ||||
|
r6906 | else: | ||
|
r14444 | if opts.get('tool'): | ||
raise util.Abort(_('--tool can only be used with --rebase')) | ||||
|
r7216 | orig(ui, repo, *args, **opts) | ||
|
r6906 | |||
|
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 | ||||
|
r19214 | numrebased = len([i for i in state.itervalues() if i != -1]) | ||
# 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): | ||
'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'")]) | ||