rebase.py
589 lines
| 23.0 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 | ''' | ||
|
r12062 | from mercurial import hg, util, repair, merge, cmdutil, commands | ||
|
r13881 | from mercurial import extensions, copies, patch | ||
|
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 | ||
|
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. | ||||
|
r10646 | If you don't specify a destination changeset (``-d/--dest``), | ||
rebase uses the tipmost head of the current named branch as the | ||||
destination. (The destination changeset is not modified by | ||||
rebasing, but new changesets are added as its descendants.) | ||||
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 | |||
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 | ||||
nothing if you are at the latest (tipmost) head of a named branch | ||||
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 | |||
Returns 0 on success, 1 if nothing to rebase. | ||||
|
r6906 | """ | ||
|
r7280 | originalwd = target = None | ||
|
r6906 | external = nullrev | ||
|
r8454 | state = {} | ||
skipped = set() | ||||
|
r10351 | targetancestors = set() | ||
|
r6906 | |||
lock = wlock = None | ||||
try: | ||||
lock = repo.lock() | ||||
wlock = repo.wlock() | ||||
# Validate input and define rebasing points | ||||
destf = opts.get('dest', None) | ||||
srcf = opts.get('source', None) | ||||
basef = opts.get('base', None) | ||||
contf = opts.get('continue') | ||||
abortf = opts.get('abort') | ||||
collapsef = opts.get('collapse', False) | ||||
|
r13661 | collapsemsg = cmdutil.logmessage(opts) | ||
|
r13609 | extrafn = opts.get('extrafn') # internal, used by e.g. hgsubversion | ||
|
r7952 | keepf = opts.get('keep', False) | ||
keepbranchesf = opts.get('keepbranches', False) | ||||
|
r10352 | detachf = opts.get('detach', 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')) | ||||
|
r10352 | if detachf: | ||
|
r11285 | raise util.Abort(_('cannot use detach 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 | |||
|
r11843 | (originalwd, target, state, skipped, collapsef, keepf, | ||
|
r7952 | keepbranchesf, external) = restorestatus(repo) | ||
|
r6906 | if abortf: | ||
|
r11205 | return abort(repo, originalwd, target, state) | ||
|
r6906 | else: | ||
if srcf and basef: | ||||
|
r11285 | raise util.Abort(_('cannot specify both a ' | ||
'revision and a base')) | ||||
|
r10352 | if detachf: | ||
if not srcf: | ||||
|
r11285 | raise util.Abort( | ||
_('detach requires a revision to be specified')) | ||||
|
r10352 | if basef: | ||
|
r11285 | raise util.Abort(_('cannot specify a base with detach')) | ||
|
r10352 | |||
|
r6906 | cmdutil.bail_if_changed(repo) | ||
|
r10352 | result = buildstate(repo, destf, srcf, basef, detachf) | ||
|
r10351 | if not result: | ||
# Empty state built, nothing to rebase | ||||
|
r8615 | ui.status(_('nothing to rebase\n')) | ||
|
r11205 | return 1 | ||
|
r10351 | else: | ||
originalwd, target, state = result | ||||
if collapsef: | ||||
targetancestors = set(repo.changelog.ancestors(target)) | ||||
external = checkexternal(repo, state, targetancestors) | ||||
|
r6906 | |||
|
r7952 | if keepbranchesf: | ||
|
r13609 | assert not extrafn, 'cannot use both keepbranches and extrafn' | ||
|
r7952 | def extrafn(ctx, extra): | ||
extra['branch'] = ctx.branch() | ||||
|
r6906 | # Rebase | ||
|
r10351 | if not targetancestors: | ||
targetancestors = set(repo.changelog.ancestors(target)) | ||||
targetancestors.add(target) | ||||
|
r6906 | |||
|
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) | ||
|
r7952 | storestatus(repo, originalwd, target, state, collapsef, keepf, | ||
keepbranchesf, external) | ||||
|
r10351 | p1, p2 = defineparents(repo, rev, target, state, | ||
targetancestors) | ||||
if len(repo.parents()) == 2: | ||||
repo.ui.debug('resuming interrupted rebase\n') | ||||
else: | ||||
|
r13856 | try: | ||
ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | ||||
|
r13880 | stats = rebasenode(repo, rev, p1, state) | ||
|
r13856 | if stats and stats[3] > 0: | ||
raise util.Abort(_('unresolved conflicts (see hg ' | ||||
'resolve, then hg rebase --continue)')) | ||||
finally: | ||||
ui.setconfig('ui', 'forcemerge', '') | ||||
|
r10351 | updatedirstate(repo, rev, target, p2) | ||
if not collapsef: | ||||
|
r10762 | newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn) | ||
|
r10351 | else: | ||
# Skip commit if we are collapsing | ||||
repo.dirstate.setparents(repo[p1].node()) | ||||
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: | ||||
if rebased not in skipped and state[rebased] != nullmerge: | ||||
commitmsg += '\n* %s' % repo[rebased].description() | ||||
commitmsg = ui.edit(commitmsg, repo.ui.username()) | ||||
|
r10352 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, | ||
|
r10762 | extrafn=extrafn) | ||
|
r6906 | |||
if 'qtip' in repo.tags(): | ||||
updatemq(repo, state, skipped, **opts) | ||||
|
r7952 | if not keepf: | ||
|
r6906 | # Remove no more useful revisions | ||
|
r10352 | rebased = [rev for rev in state if state[rev] != nullmerge] | ||
if rebased: | ||||
if set(repo.changelog.descendants(min(rebased))) - set(state): | ||||
|
r10436 | ui.warn(_("warning: new changesets detected " | ||
"on source branch, not stripping\n")) | ||||
|
r10352 | else: | ||
|
r11201 | # backup the old csets by default | ||
repair.strip(ui, repo, repo[min(rebased)].node(), "all") | ||||
|
r6906 | |||
clearstatus(repo) | ||||
|
r11203 | ui.note(_("rebase completed\n")) | ||
|
r7130 | if os.path.exists(repo.sjoin('undo')): | ||
|
r13235 | util.unlinkpath(repo.sjoin('undo')) | ||
|
r6906 | if skipped: | ||
ui.note(_("%d revisions have been skipped\n") % len(skipped)) | ||||
finally: | ||||
|
r8112 | release(lock, wlock) | ||
|
r6906 | |||
|
r10351 | def checkexternal(repo, state, targetancestors): | ||
"""Check whether one or more external revisions need to be taken in | ||||
consideration. In the latter case, abort. | ||||
""" | ||||
external = nullrev | ||||
source = min(state) | ||||
for rev in state: | ||||
if rev == source: | ||||
continue | ||||
# Check externals and fail if there are more than one | ||||
for p in repo[rev].parents(): | ||||
if (p.rev() not in state | ||||
and p.rev() not in targetancestors): | ||||
if external != nullrev: | ||||
raise util.Abort(_('unable to collapse, there is more ' | ||||
'than one external parent')) | ||||
external = p.rev() | ||||
return external | ||||
def updatedirstate(repo, rev, p1, p2): | ||||
"""Keep track of renamed files in the revision that is going to be rebased | ||||
""" | ||||
# Here we simulate the copies and renames in the source changeset | ||||
cop, diver = copies.copies(repo, repo[rev], repo[p1], repo[p2], True) | ||||
m1 = repo[rev].manifest() | ||||
m2 = repo[p1].manifest() | ||||
for k, v in cop.iteritems(): | ||||
if k in m1: | ||||
if v in m1 or v in m2: | ||||
repo.dirstate.copy(v, k) | ||||
|
r13894 | if v in m2 and v not in m1 and k in m2: | ||
|
r10351 | repo.dirstate.remove(v) | ||
|
r10762 | def concludenode(repo, rev, p1, p2, commitmsg=None, extrafn=None): | ||
|
r10351 | 'Commit the changes and store useful information in extra' | ||
|
r6906 | try: | ||
|
r10351 | repo.dirstate.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(), | ||
date=ctx.date(), extra=extra) | ||||
|
r8266 | repo.dirstate.setbranch(repo[newrev].branch()) | ||
|
r6906 | return newrev | ||
except util.Abort: | ||||
# Invalidate the previous setparents | ||||
repo.dirstate.invalidate() | ||||
raise | ||||
|
r13880 | def rebasenode(repo, rev, p1, state): | ||
|
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])) | ||||
|
r13875 | base = None | ||
if repo[rev].rev() != repo[min(state)].rev(): | ||||
|
r13878 | base = repo[rev].p1().node() | ||
|
r13875 | return merge.update(repo, rev, True, True, False, base) | ||
|
r6923 | |||
|
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 | ||||
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] | ||||
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 | ||
|
r13766 | original_series = mq.full_series[:] | ||
|
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)) | ||||
|
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])]) | ||||
|
r13766 | |||
# Restore missing guards | ||||
for s in original_series: | ||||
pname = mq.guard_re.split(s, 1)[0] | ||||
if pname in mq.full_series: | ||||
repo.ui.debug('restoring guard for patch %s' % (pname)) | ||||
mq.full_series.remove(pname) | ||||
mq.full_series.append(s) | ||||
mq.series_dirty = True | ||||
|
r11537 | mq.save_dirty() | ||
|
r6906 | |||
|
r7952 | def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, | ||
external): | ||||
|
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)) | ||||
|
r7622 | for d, v in state.iteritems(): | ||
|
r6906 | oldrev = repo[d].hex() | ||
newrev = repo[v].hex() | ||||
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' | ||||
if os.path.exists(repo.join("rebasestate")): | ||||
|
r13235 | util.unlinkpath(repo.join("rebasestate")) | ||
|
r6906 | |||
def restorestatus(repo): | ||||
'Restore a previously stored status' | ||||
try: | ||||
target = None | ||||
collapse = False | ||||
external = nullrev | ||||
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)) | ||||
|
r6906 | else: | ||
oldrev, newrev = l.split(':') | ||||
state[repo[oldrev].rev()] = repo[newrev].rev() | ||||
|
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) | ||||
repo.ui.debug('computed skipped revs: %s\n' % skipped) | ||||
|
r9467 | repo.ui.debug('rebase status resumed\n') | ||
|
r11843 | return (originalwd, target, state, skipped, | ||
collapse, keep, keepbranches, external) | ||||
|
r6906 | except IOError, err: | ||
if err.errno != errno.ENOENT: | ||||
raise | ||||
raise util.Abort(_('no rebase in progress')) | ||||
def abort(repo, originalwd, target, state): | ||||
'Restore the repository to its original state' | ||||
|
r8150 | if set(repo.changelog.descendants(target)) - set(state.values()): | ||
|
r6906 | repo.ui.warn(_("warning: new changesets detected on target branch, " | ||
|
r11204 | "can't abort\n")) | ||
|
r11205 | return -1 | ||
|
r6906 | else: | ||
# Strip from the first rebased revision | ||||
merge.update(repo, repo[originalwd].rev(), False, True, False) | ||||
|
r11316 | rebased = filter(lambda x: x > -1 and x != target, state.values()) | ||
|
r6906 | if rebased: | ||
strippoint = min(rebased) | ||||
|
r11201 | # no backup of rebased cset versions needed | ||
repair.strip(repo.ui, repo, repo[strippoint].node()) | ||||
|
r6906 | clearstatus(repo) | ||
|
r12861 | repo.ui.warn(_('rebase aborted\n')) | ||
|
r11205 | return 0 | ||
|
r6906 | |||
|
r10352 | def buildstate(repo, dest, src, base, detach): | ||
|
r6906 | 'Define which revisions are going to be rebased and where' | ||
|
r8150 | targetancestors = set() | ||
|
r10352 | detachset = set() | ||
|
r6906 | |||
if not dest: | ||||
|
r7877 | # Destination defaults to the latest revision in the current branch | ||
|
r6906 | branch = repo[None].branch() | ||
dest = repo[branch].rev() | ||||
else: | ||||
dest = repo[dest].rev() | ||||
|
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. | ||||
|
r10678 | if 'qtip' in repo.tags() and (repo[dest].node() in | ||
[s.node for s in repo.mq.applied]): | ||||
|
r10672 | raise util.Abort(_('cannot rebase onto an applied mq patch')) | ||
|
r6906 | if src: | ||
commonbase = repo[src].ancestor(repo[dest]) | ||||
|
r13733 | samebranch = repo[src].branch() == repo[dest].branch() | ||
|
r6906 | if commonbase == repo[src]: | ||
|
r9577 | raise util.Abort(_('source is ancestor of destination')) | ||
|
r13733 | if samebranch and commonbase == repo[dest]: | ||
|
r9577 | raise util.Abort(_('source is descendant of destination')) | ||
|
r6906 | source = repo[src].rev() | ||
|
r10352 | if detach: | ||
# We need to keep track of source's ancestors up to the common base | ||||
srcancestors = set(repo.changelog.ancestors(source)) | ||||
baseancestors = set(repo.changelog.ancestors(commonbase.rev())) | ||||
detachset = srcancestors - baseancestors | ||||
|
r13021 | detachset.discard(commonbase.rev()) | ||
|
r6906 | else: | ||
if base: | ||||
cwd = repo[base].rev() | ||||
else: | ||||
cwd = repo['.'].rev() | ||||
if cwd == dest: | ||||
|
r9577 | repo.ui.debug('source and destination are the same\n') | ||
|
r6906 | return None | ||
|
r8150 | targetancestors = set(repo.changelog.ancestors(dest)) | ||
|
r6906 | if cwd in targetancestors: | ||
|
r9577 | repo.ui.debug('source is ancestor of destination\n') | ||
|
r6906 | return None | ||
|
r8150 | cwdancestors = set(repo.changelog.ancestors(cwd)) | ||
|
r9578 | if dest in cwdancestors: | ||
repo.ui.debug('source is descendant of destination\n') | ||||
return None | ||||
|
r6906 | cwdancestors.add(cwd) | ||
rebasingbranch = cwdancestors - targetancestors | ||||
source = min(rebasingbranch) | ||||
|
r6923 | |||
|
r9467 | repo.ui.debug('rebase onto %d starting from %d\n' % (dest, source)) | ||
|
r6906 | state = dict.fromkeys(repo.changelog.descendants(source), nullrev) | ||
|
r10352 | state.update(dict.fromkeys(detachset, nullmerge)) | ||
|
r6906 | state[source] = nullrev | ||
|
r10351 | return repo['.'].rev(), repo[dest].rev(), state | ||
|
r6906 | |||
|
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 | |||
cmdutil.bail_if_changed(repo) | ||||
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: | ||||
|
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) | ||
|
r6906 | else: | ||
|
r7216 | orig(ui, repo, *args, **opts) | ||
|
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, | ||||
_("rebase working directory to branch head")) | ||||
) | ||||
|
r6906 | |||
cmdtable = { | ||||
"rebase": | ||||
(rebase, | ||||
[ | ||||
|
r11321 | ('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')), | ||||
('d', 'dest', '', | ||||
_('rebase onto the specified changeset'), _('REV')), | ||||
|
r9589 | ('', 'collapse', False, _('collapse the rebased changesets')), | ||
|
r13661 | ('m', 'message', '', | ||
_('use text as collapse commit message'), _('TEXT')), | ||||
('l', 'logfile', '', | ||||
_('read collapse commit message from file'), _('FILE')), | ||||
|
r9589 | ('', 'keep', False, _('keep original changesets')), | ||
('', 'keepbranches', False, _('keep original branch names')), | ||||
|
r10352 | ('', 'detach', False, _('force detaching of source from its original ' | ||
'branch')), | ||||
|
r13856 | ('t', 'tool', '', _('specify merge tool')), | ||
|
r6906 | ('c', 'continue', False, _('continue an interrupted rebase')), | ||
|
r10413 | ('a', 'abort', False, _('abort an interrupted rebase'))] + | ||
|
r6906 | templateopts, | ||
|
r10646 | _('hg rebase [-s REV | -b REV] [-d REV] [options]\n' | ||
'hg rebase {-a|-c}')) | ||||
|
r6906 | } | ||