##// END OF EJS Templates
win32: add hgweb scripts to Inno Setup installer
win32: add hgweb scripts to Inno Setup installer

File last commit:

r12062:c327bfa5 default
r12081:787a5a71 stable
Show More
rebase.py
571 lines | 22.0 KiB | text/x-python | PythonLexer
Stefano Tortarolo
Add rebase extension
r6906 # rebase.py - rebasing feature for mercurial
#
# Copyright 2008 Stefano Tortarolo <stefano.tortarolo at gmail dot com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Stefano Tortarolo
Add rebase extension
r6906
Dirkjan Ochtman
extensions: change descriptions for extensions providing a few commands
r8934 '''command to move sets of revisions to a different ancestor
Stefano Tortarolo
Add rebase extension
r6906
Martin Geisler
rebase: word-wrap help texts at 70 characters
r7999 This extension lets you rebase changesets in an existing Mercurial
repository.
Stefano Tortarolo
Add rebase extension
r6906
For more information:
Martin Geisler
rebase: link to RebaseExtension...
r9301 http://mercurial.selenic.com/wiki/RebaseExtension
Stefano Tortarolo
Add rebase extension
r6906 '''
Sune Foldager
rebase: improve output of hg pull --rebase (issue2072)
r10628 from mercurial import hg, util, repair, merge, cmdutil, commands, error
Stefano Tortarolo
rebase: keep original mq patch format (Issue1574)...
r7955 from mercurial import extensions, ancestor, copies, patch
Stefano Tortarolo
Add rebase extension
r6906 from mercurial.commands import templateopts
from mercurial.node import nullrev
Ronny Pfannschmidt
switch lock releasing in the extensions from gc to explicit
r8112 from mercurial.lock import release
Stefano Tortarolo
Add rebase extension
r6906 from mercurial.i18n import _
import os, errno
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 nullmerge = -2
Stefano Tortarolo
Add rebase extension
r6906 def rebase(ui, repo, **opts):
"""move changeset (and descendants) to a different branch
Martin Geisler
rebase: word-wrap help texts at 70 characters
r7999 Rebase uses repeated merging to graft changesets from one part of
Greg Ward
rebase: improve help text...
r10646 history (the source) onto another (the destination). This can be
Martin Geisler
rebase: stress that only local changesets should be rebased
r11188 useful for linearizing *local* changes relative to a master
Greg Ward
rebase: improve help text...
r10646 development tree.
Martin Geisler
rebase: stress that only local changesets should be rebased
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.
Greg Ward
rebase: improve help text...
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
Martin Geisler
rebase: remove unnecessary \" from help string...
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.
Greg Ward
rebase: improve help text...
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).
Stefano Tortarolo
Add rebase extension
r6906
Martin Geisler
rebase: word-wrap help texts at 70 characters
r7999 If a rebase is interrupted to manually resolve a merge, it can be
Martin Geisler
help texts: write command line switches as -a/--abc
r8076 continued with --continue/-c or aborted with --abort/-a.
Matt Mackall
rebase: add error codes...
r11205
Returns 0 on success, 1 if nothing to rebase.
Stefano Tortarolo
Add rebase extension
r6906 """
Benoit Boissinot
remove unused variables
r7280 originalwd = target = None
Stefano Tortarolo
Add rebase extension
r6906 external = nullrev
Benoit Boissinot
rebase: use set instead of dict
r8454 state = {}
skipped = set()
Stefano Tortarolo
rebase: refactoring...
r10351 targetancestors = set()
Stefano Tortarolo
Add rebase extension
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)
Augie Fackler
rebase: add support to keep branch names...
r7468 extrafn = opts.get('extrafn')
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 keepf = opts.get('keep', False)
keepbranchesf = opts.get('keepbranches', False)
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 detachf = opts.get('detach', False)
Stefano Tortarolo
rebase: add option to not commit after a collapsing...
r10677 # keepopen is not meant for use on the command line, but by
# other extensions
keepopen = opts.get('keepopen', False)
Augie Fackler
rebase: add support to keep branch names...
r7468
Stefano Tortarolo
Add rebase extension
r6906 if contf or abortf:
if contf and abortf:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(_('cannot use both abort and continue'))
Stefano Tortarolo
Add rebase extension
r6906 if collapsef:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(
_('cannot use collapse with continue or abort'))
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 if detachf:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(_('cannot use detach with continue or abort'))
Martin Geisler
remove unnecessary outer parenthesis in if-statements
r8117 if srcf or basef or destf:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(
Stefano Tortarolo
Add rebase extension
r6906 _('abort and continue do not allow specifying revisions'))
Benoit Boissinot
rebase: recompute the set of skipped rev when using --continue (issue2330)
r11843 (originalwd, target, state, skipped, collapsef, keepf,
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 keepbranchesf, external) = restorestatus(repo)
Stefano Tortarolo
Add rebase extension
r6906 if abortf:
Matt Mackall
rebase: add error codes...
r11205 return abort(repo, originalwd, target, state)
Stefano Tortarolo
Add rebase extension
r6906 else:
if srcf and basef:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(_('cannot specify both a '
'revision and a base'))
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 if detachf:
if not srcf:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(
_('detach requires a revision to be specified'))
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 if basef:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(_('cannot specify a base with detach'))
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352
Stefano Tortarolo
Add rebase extension
r6906 cmdutil.bail_if_changed(repo)
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 result = buildstate(repo, destf, srcf, basef, detachf)
Stefano Tortarolo
rebase: refactoring...
r10351 if not result:
# Empty state built, nothing to rebase
Martin Geisler
use ui instead of repo.ui when the former is in scope
r8615 ui.status(_('nothing to rebase\n'))
Matt Mackall
rebase: add error codes...
r11205 return 1
Stefano Tortarolo
rebase: refactoring...
r10351 else:
originalwd, target, state = result
if collapsef:
targetancestors = set(repo.changelog.ancestors(target))
external = checkexternal(repo, state, targetancestors)
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 if keepbranchesf:
if extrafn:
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 raise util.Abort(_('cannot use both keepbranches and extrafn'))
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 def extrafn(ctx, extra):
extra['branch'] = ctx.branch()
Stefano Tortarolo
Add rebase extension
r6906 # Rebase
Stefano Tortarolo
rebase: refactoring...
r10351 if not targetancestors:
targetancestors = set(repo.changelog.ancestors(target))
targetancestors.add(target)
Stefano Tortarolo
Add rebase extension
r6906
Matt Mackall
replace util.sort with sorted built-in...
r8209 for rev in sorted(state):
Stefano Tortarolo
Add rebase extension
r6906 if state[rev] == -1:
Stefano Tortarolo
rebase: refactoring...
r10351 ui.debug("rebasing %d:%s\n" % (rev, repo[rev]))
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 storestatus(repo, originalwd, target, state, collapsef, keepf,
keepbranchesf, external)
Stefano Tortarolo
rebase: refactoring...
r10351 p1, p2 = defineparents(repo, rev, target, state,
targetancestors)
if len(repo.parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n')
else:
stats = rebasenode(repo, rev, p1, p2, state)
if stats and stats[3] > 0:
raise util.Abort(_('fix unresolved conflicts with hg '
'resolve then run hg rebase --continue'))
updatedirstate(repo, rev, target, p2)
if not collapsef:
Patrick Mezard
rebase: fix --collapse with --keepbranches (issue2100)...
r10762 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)
Stefano Tortarolo
rebase: refactoring...
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
Stefano Tortarolo
Add rebase extension
r6906 ui.note(_('rebase merging completed\n'))
Stefano Tortarolo
rebase: add option to not commit after a collapsing...
r10677 if collapsef and not keepopen:
Dirkjan Ochtman
strip trailing whitespace, replace tabs by spaces
r6923 p1, p2 = defineparents(repo, min(state), target,
Stefano Tortarolo
Add rebase extension
r6906 state, targetancestors)
Stefano Tortarolo
rebase: refactoring...
r10351 commitmsg = 'Collapsed revision'
for rebased in state:
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 if rebased not in skipped and state[rebased] != nullmerge:
Stefano Tortarolo
rebase: refactoring...
r10351 commitmsg += '\n* %s' % repo[rebased].description()
commitmsg = ui.edit(commitmsg, repo.ui.username())
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
Patrick Mezard
rebase: fix --collapse with --keepbranches (issue2100)...
r10762 extrafn=extrafn)
Stefano Tortarolo
Add rebase extension
r6906
if 'qtip' in repo.tags():
updatemq(repo, state, skipped, **opts)
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 if not keepf:
Stefano Tortarolo
Add rebase extension
r6906 # Remove no more useful revisions
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 rebased = [rev for rev in state if state[rev] != nullmerge]
if rebased:
if set(repo.changelog.descendants(min(rebased))) - set(state):
Stefano Tortarolo
rebase: split line longer than 80 chars
r10436 ui.warn(_("warning: new changesets detected "
"on source branch, not stripping\n"))
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 else:
Matt Mackall
Fix up rebase's handling of strip backups
r11201 # backup the old csets by default
repair.strip(ui, repo, repo[min(rebased)].node(), "all")
Stefano Tortarolo
Add rebase extension
r6906
clearstatus(repo)
Matt Mackall
rebase: only show "rebase completed" message with -v
r11203 ui.note(_("rebase completed\n"))
Stefano Tortarolo
rebase: disable rollback after rebasing
r7130 if os.path.exists(repo.sjoin('undo')):
util.unlink(repo.sjoin('undo'))
Stefano Tortarolo
Add rebase extension
r6906 if skipped:
ui.note(_("%d revisions have been skipped\n") % len(skipped))
finally:
Ronny Pfannschmidt
switch lock releasing in the extensions from gc to explicit
r8112 release(lock, wlock)
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
rebase: refactoring...
r10351 def rebasemerge(repo, rev, first=False):
'return the correct ancestor'
oldancestor = ancestor.ancestor
def newancestor(a, b, pfunc):
if b == rev:
return repo[rev].parents()[0].rev()
return oldancestor(a, b, pfunc)
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
rebase: refactoring...
r10351 if not first:
ancestor.ancestor = newancestor
else:
repo.ui.debug("first revision, do not change ancestor\n")
try:
stats = merge.update(repo, rev, True, True, False)
return stats
finally:
ancestor.ancestor = oldancestor
Benoit Boissinot
rebase: use set instead of dict
r8454
Stefano Tortarolo
rebase: refactoring...
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)
if v in m2 and v not in m1:
repo.dirstate.remove(v)
Patrick Mezard
rebase: fix --collapse with --keepbranches (issue2100)...
r10762 def concludenode(repo, rev, p1, p2, commitmsg=None, extrafn=None):
Stefano Tortarolo
rebase: refactoring...
r10351 'Commit the changes and store useful information in extra'
Stefano Tortarolo
Add rebase extension
r6906 try:
Stefano Tortarolo
rebase: refactoring...
r10351 repo.dirstate.setparents(repo[p1].node(), repo[p2].node())
Nicolas Dumazet
rebase: small cosmetic cleanups
r11537 ctx = repo[rev]
Stefano Tortarolo
rebase: refactoring...
r10351 if commitmsg is None:
Nicolas Dumazet
rebase: small cosmetic cleanups
r11537 commitmsg = ctx.description()
Patrick Mezard
rebase: fix --collapse with --keepbranches (issue2100)...
r10762 extra = {'rebase_source': ctx.hex()}
if extrafn:
extrafn(ctx, extra)
Stefano Tortarolo
Add rebase extension
r6906 # Commit might fail if unresolved files exist
Patrick Mezard
rebase: fix --collapse with --keepbranches (issue2100)...
r10762 newrev = repo.commit(text=commitmsg, user=ctx.user(),
date=ctx.date(), extra=extra)
Patrick Mezard
rebase: fix bug where --keepbranches could leave wrong branch in dirstate...
r8266 repo.dirstate.setbranch(repo[newrev].branch())
Stefano Tortarolo
Add rebase extension
r6906 return newrev
except util.Abort:
# Invalidate the previous setparents
repo.dirstate.invalidate()
raise
Stefano Tortarolo
rebase: refactoring...
r10351 def rebasenode(repo, rev, p1, p2, state):
Stefano Tortarolo
Add rebase extension
r6906 'Rebase a single revision'
# Merge phase
Stefano Tortarolo
rebase: refactoring...
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)
Stefano Tortarolo
Add rebase extension
r6906 else:
Stefano Tortarolo
rebase: refactoring...
r10351 repo.ui.debug(" already in target\n")
repo.dirstate.write()
repo.ui.debug(" merge against %d:%s\n" % (repo[rev].rev(), repo[rev]))
first = repo[rev].rev() == repo[min(state)].rev()
stats = rebasemerge(repo, rev, first)
return stats
Dirkjan Ochtman
strip trailing whitespace, replace tabs by spaces
r6923
Stefano Tortarolo
Add rebase extension
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:
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 if state[P1n] == nullmerge:
p1 = target
else:
p1 = state[P1n]
Stefano Tortarolo
Add rebase extension
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
Stefano Tortarolo
rebase: refactoring...
r10351 repo.ui.debug(" future parents are %d and %d\n" %
(repo[p1].rev(), repo[p2].rev()))
Stefano Tortarolo
Add rebase extension
r6906 return p1, p2
Stefano Tortarolo
rebase: keep original mq patch format (Issue1574)...
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
Stefano Tortarolo
Add rebase extension
r6906 def updatemq(repo, state, skipped, **opts):
'Update rebased mq patches - finalize and then import them'
mqrebase = {}
Nicolas Dumazet
rebase: small cosmetic cleanups
r11537 mq = repo.mq
for p in mq.applied:
rev = repo[p.node].rev()
if rev in state:
Martin Geisler
do not attempt to translate ui.debug output
r9467 repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' %
Nicolas Dumazet
rebase: small cosmetic cleanups
r11537 (rev, p.name))
mqrebase[rev] = (p.name, isagitpatch(repo, p.name))
Stefano Tortarolo
Add rebase extension
r6906
if mqrebase:
Nicolas Dumazet
rebase: small cosmetic cleanups
r11537 mq.finish(repo, mqrebase.keys())
Stefano Tortarolo
Add rebase extension
r6906
# We must start import from the newest revision
Matt Mackall
replace various uses of list.reverse()
r8210 for rev in sorted(mqrebase, reverse=True):
Stefano Tortarolo
Add rebase extension
r6906 if rev not in skipped:
Nicolas Dumazet
rebase: small cosmetic cleanups
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])])
mq.save_dirty()
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches,
external):
Stefano Tortarolo
Add rebase extension
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))
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 f.write('%d\n' % int(keep))
f.write('%d\n' % int(keepbranches))
Dirkjan Ochtman
use dict.iteritems() rather than dict.items()...
r7622 for d, v in state.iteritems():
Stefano Tortarolo
Add rebase extension
r6906 oldrev = repo[d].hex()
newrev = repo[v].hex()
f.write("%s:%s\n" % (oldrev, newrev))
f.close()
Martin Geisler
do not attempt to translate ui.debug output
r9467 repo.ui.debug('rebase status stored\n')
Stefano Tortarolo
Add rebase extension
r6906
def clearstatus(repo):
'Remove the status files'
if os.path.exists(repo.join("rebasestate")):
util.unlink(repo.join("rebasestate"))
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))
Stefano Tortarolo
rebase: store/restore arguments correctly...
r7952 elif i == 4:
keep = bool(int(l))
elif i == 5:
keepbranches = bool(int(l))
Stefano Tortarolo
Add rebase extension
r6906 else:
oldrev, newrev = l.split(':')
state[repo[oldrev].rev()] = repo[newrev].rev()
Benoit Boissinot
rebase: recompute the set of skipped rev when using --continue (issue2330)
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)
Martin Geisler
do not attempt to translate ui.debug output
r9467 repo.ui.debug('rebase status resumed\n')
Benoit Boissinot
rebase: recompute the set of skipped rev when using --continue (issue2330)
r11843 return (originalwd, target, state, skipped,
collapse, keep, keepbranches, external)
Stefano Tortarolo
Add rebase extension
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'
Martin Geisler
util: use built-in set and frozenset...
r8150 if set(repo.changelog.descendants(target)) - set(state.values()):
Stefano Tortarolo
Add rebase extension
r6906 repo.ui.warn(_("warning: new changesets detected on target branch, "
Matt Mackall
rebase: improve --abort failure message
r11204 "can't abort\n"))
Matt Mackall
rebase: add error codes...
r11205 return -1
Stefano Tortarolo
Add rebase extension
r6906 else:
# Strip from the first rebased revision
merge.update(repo, repo[originalwd].rev(), False, True, False)
Stefano Tortarolo
rebase: --abort doesn't strip away the target changeset (issue2220)...
r11316 rebased = filter(lambda x: x > -1 and x != target, state.values())
Stefano Tortarolo
Add rebase extension
r6906 if rebased:
strippoint = min(rebased)
Matt Mackall
Fix up rebase's handling of strip backups
r11201 # no backup of rebased cset versions needed
repair.strip(repo.ui, repo, repo[strippoint].node())
Stefano Tortarolo
Add rebase extension
r6906 clearstatus(repo)
repo.ui.status(_('rebase aborted\n'))
Matt Mackall
rebase: add error codes...
r11205 return 0
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 def buildstate(repo, dest, src, base, detach):
Stefano Tortarolo
Add rebase extension
r6906 'Define which revisions are going to be rebased and where'
Martin Geisler
util: use built-in set and frozenset...
r8150 targetancestors = set()
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 detachset = set()
Stefano Tortarolo
Add rebase extension
r6906
if not dest:
Peter Arrenbrecht
cleanup: whitespace cleanup
r7877 # Destination defaults to the latest revision in the current branch
Stefano Tortarolo
Add rebase extension
r6906 branch = repo[None].branch()
dest = repo[branch].rev()
else:
dest = repo[dest].rev()
Greg Ward
rebase: always check if rebasing onto an applied mq patch....
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.
Benoit Boissinot
mq: avoid many hex/bin conversions, keep the binary node when possible
r10678 if 'qtip' in repo.tags() and (repo[dest].node() in
[s.node for s in repo.mq.applied]):
Greg Ward
rebase: always check if rebasing onto an applied mq patch....
r10672 raise util.Abort(_('cannot rebase onto an applied mq patch'))
Stefano Tortarolo
Add rebase extension
r6906 if src:
commonbase = repo[src].ancestor(repo[dest])
if commonbase == repo[src]:
Sune Foldager
rebase: improve error and debug messages
r9577 raise util.Abort(_('source is ancestor of destination'))
Stefano Tortarolo
Add rebase extension
r6906 if commonbase == repo[dest]:
Sune Foldager
rebase: improve error and debug messages
r9577 raise util.Abort(_('source is descendant of destination'))
Stefano Tortarolo
Add rebase extension
r6906 source = repo[src].rev()
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
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
detachset.remove(commonbase.rev())
Stefano Tortarolo
Add rebase extension
r6906 else:
if base:
cwd = repo[base].rev()
else:
cwd = repo['.'].rev()
if cwd == dest:
Sune Foldager
rebase: improve error and debug messages
r9577 repo.ui.debug('source and destination are the same\n')
Stefano Tortarolo
Add rebase extension
r6906 return None
Martin Geisler
util: use built-in set and frozenset...
r8150 targetancestors = set(repo.changelog.ancestors(dest))
Stefano Tortarolo
Add rebase extension
r6906 if cwd in targetancestors:
Sune Foldager
rebase: improve error and debug messages
r9577 repo.ui.debug('source is ancestor of destination\n')
Stefano Tortarolo
Add rebase extension
r6906 return None
Martin Geisler
util: use built-in set and frozenset...
r8150 cwdancestors = set(repo.changelog.ancestors(cwd))
Sune Foldager
rebase: return early when source is descendant of destination...
r9578 if dest in cwdancestors:
repo.ui.debug('source is descendant of destination\n')
return None
Stefano Tortarolo
Add rebase extension
r6906 cwdancestors.add(cwd)
rebasingbranch = cwdancestors - targetancestors
source = min(rebasingbranch)
Dirkjan Ochtman
strip trailing whitespace, replace tabs by spaces
r6923
Martin Geisler
do not attempt to translate ui.debug output
r9467 repo.ui.debug('rebase onto %d starting from %d\n' % (dest, source))
Stefano Tortarolo
Add rebase extension
r6906 state = dict.fromkeys(repo.changelog.descendants(source), nullrev)
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 state.update(dict.fromkeys(detachset, nullmerge))
Stefano Tortarolo
Add rebase extension
r6906 state[source] = nullrev
Stefano Tortarolo
rebase: refactoring...
r10351 return repo['.'].rev(), repo[dest].rev(), state
Stefano Tortarolo
Add rebase extension
r6906
Matt Mackall
extensions: use new wrapper functions
r7216 def pullrebase(orig, ui, repo, *args, **opts):
Stefano Tortarolo
Add rebase extension
r6906 'Call rebase after pull if the latter has been invoked with --rebase'
if opts.get('rebase'):
if opts.get('update'):
Martijn Pieters
Fix typeerror when specifying both --rebase and --pull
r8242 del opts['update']
Martin Geisler
do not attempt to translate ui.debug output
r9467 ui.debug('--update and --rebase are not compatible, ignoring '
'the update flag\n')
Stefano Tortarolo
Add rebase extension
r6906
cmdutil.bail_if_changed(repo)
revsprepull = len(repo)
Sune Foldager
rebase: improve output of hg pull --rebase (issue2072)
r10628 origpostincoming = commands.postincoming
def _dummy(*args, **kwargs):
pass
commands.postincoming = _dummy
try:
orig(ui, repo, *args, **opts)
finally:
commands.postincoming = origpostincoming
Stefano Tortarolo
Add rebase extension
r6906 revspostpull = len(repo)
if revspostpull > revsprepull:
Matt Mackall
extensions: use new wrapper functions
r7216 rebase(ui, repo, **opts)
Stefano Tortarolo
rebase: pull --rebase updates if there is nothing to rebase
r7786 branch = repo[None].branch()
dest = repo[branch].rev()
if dest != repo['.'].rev():
# there was nothing to rebase we force an update
Sune Foldager
rebase: improve output of hg pull --rebase (issue2072)
r10628 hg.update(repo, dest)
Stefano Tortarolo
Add rebase extension
r6906 else:
Matt Mackall
extensions: use new wrapper functions
r7216 orig(ui, repo, *args, **opts)
Stefano Tortarolo
Add rebase extension
r6906
def uisetup(ui):
'Replace pull with a decorator to provide --rebase option'
Matt Mackall
extensions: use new wrapper functions
r7216 entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
entry[1].append(('', 'rebase', None,
_("rebase working directory to branch head"))
)
Stefano Tortarolo
Add rebase extension
r6906
cmdtable = {
"rebase":
(rebase,
[
FUJIWARA Katsunori
help: show value requirement and multiple occurrence of options...
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')),
timeless@mozdev.org
rebase: change rebase help to talk about changesets and branch names
r9589 ('', 'collapse', False, _('collapse the rebased changesets')),
('', 'keep', False, _('keep original changesets')),
('', 'keepbranches', False, _('keep original branch names')),
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 ('', 'detach', False, _('force detaching of source from its original '
'branch')),
Stefano Tortarolo
Add rebase extension
r6906 ('c', 'continue', False, _('continue an interrupted rebase')),
Matt Mackall
fix up a bunch of check-code warnings
r10413 ('a', 'abort', False, _('abort an interrupted rebase'))] +
Stefano Tortarolo
Add rebase extension
r6906 templateopts,
Greg Ward
rebase: improve help text...
r10646 _('hg rebase [-s REV | -b REV] [-d REV] [options]\n'
'hg rebase {-a|-c}'))
Stefano Tortarolo
Add rebase extension
r6906 }