2008-08-18 23:16:31 +04:00
|
|
|
# rebase.py - rebasing feature for mercurial
|
|
|
|
#
|
|
|
|
# Copyright 2008 Stefano Tortarolo <stefano.tortarolo at gmail dot com>
|
|
|
|
#
|
2009-04-26 03:08:54 +04:00
|
|
|
# This software may be used and distributed according to the terms of the
|
2010-01-20 07:20:08 +03:00
|
|
|
# GNU General Public License version 2 or any later version.
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2009-06-24 15:42:02 +04:00
|
|
|
'''command to move sets of revisions to a different ancestor
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2009-07-26 03:59:59 +04:00
|
|
|
This extension lets you rebase changesets in an existing Mercurial
|
|
|
|
repository.
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
For more information:
|
2009-08-03 02:19:01 +04:00
|
|
|
http://mercurial.selenic.com/wiki/RebaseExtension
|
2008-08-18 23:16:31 +04:00
|
|
|
'''
|
|
|
|
|
2011-07-15 22:07:19 +04:00
|
|
|
from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks
|
2013-02-09 02:27:59 +04:00
|
|
|
from mercurial import extensions, patch, scmutil, phases, obsolete, error
|
2014-10-13 23:33:13 +04:00
|
|
|
from mercurial import copies
|
2008-08-18 23:16:31 +04:00
|
|
|
from mercurial.commands import templateopts
|
2014-12-09 05:45:26 +03:00
|
|
|
from mercurial.node import nullrev, nullid, hex, short
|
2009-04-22 04:01:22 +04:00
|
|
|
from mercurial.lock import release
|
2008-08-18 23:16:31 +04:00
|
|
|
from mercurial.i18n import _
|
|
|
|
import os, errno
|
|
|
|
|
2014-12-02 20:46:20 +03:00
|
|
|
revtodo = -1
|
2010-02-06 12:51:50 +03:00
|
|
|
nullmerge = -2
|
2013-01-19 02:41:48 +04:00
|
|
|
revignored = -3
|
2010-02-06 12:51:50 +03:00
|
|
|
|
2011-05-12 19:09:56 +04:00
|
|
|
cmdtable = {}
|
|
|
|
command = cmdutil.command(cmdtable)
|
2012-05-15 23:37:49 +04:00
|
|
|
testedwith = 'internal'
|
2011-05-12 19:09:56 +04:00
|
|
|
|
2013-10-01 22:48:53 +04:00
|
|
|
def _savegraft(ctx, extra):
|
|
|
|
s = ctx.extra().get('source', None)
|
|
|
|
if s is not None:
|
|
|
|
extra['source'] = s
|
|
|
|
|
2013-10-01 22:28:18 +04:00
|
|
|
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
|
|
|
|
|
2011-05-12 19:09:56 +04:00
|
|
|
@command('rebase',
|
|
|
|
[('s', 'source', '',
|
2014-10-08 22:40:50 +04:00
|
|
|
_('rebase the specified changeset and descendants'), _('REV')),
|
2011-05-12 19:09:56 +04:00
|
|
|
('b', 'base', '',
|
2014-10-08 22:40:50 +04:00
|
|
|
_('rebase everything from branching point of specified changeset'),
|
2011-05-12 19:09:56 +04:00
|
|
|
_('REV')),
|
2011-10-15 22:12:32 +04:00
|
|
|
('r', 'rev', [],
|
|
|
|
_('rebase these revisions'),
|
|
|
|
_('REV')),
|
2011-05-12 19:09:56 +04:00
|
|
|
('d', 'dest', '',
|
|
|
|
_('rebase onto the specified changeset'), _('REV')),
|
|
|
|
('', 'collapse', False, _('collapse the rebased changesets')),
|
|
|
|
('m', 'message', '',
|
|
|
|
_('use text as collapse commit message'), _('TEXT')),
|
2011-10-11 08:01:25 +04:00
|
|
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
2011-05-12 19:09:56 +04:00
|
|
|
('l', 'logfile', '',
|
|
|
|
_('read collapse commit message from file'), _('FILE')),
|
|
|
|
('', 'keep', False, _('keep original changesets')),
|
|
|
|
('', 'keepbranches', False, _('keep original branch names')),
|
2012-06-20 22:08:57 +04:00
|
|
|
('D', 'detach', False, _('(DEPRECATED)')),
|
2014-09-01 13:48:55 +04:00
|
|
|
('i', 'interactive', False, _('(DEPRECATED)')),
|
2011-05-12 19:09:56 +04:00
|
|
|
('t', 'tool', '', _('specify merge tool')),
|
|
|
|
('c', 'continue', False, _('continue an interrupted rebase')),
|
|
|
|
('a', 'abort', False, _('abort an interrupted rebase'))] +
|
|
|
|
templateopts,
|
2012-07-31 20:18:26 +04:00
|
|
|
_('[-s REV | -b REV] [-d REV] [OPTION]'))
|
2008-08-18 23:16:31 +04:00
|
|
|
def rebase(ui, repo, **opts):
|
|
|
|
"""move changeset (and descendants) to a different branch
|
|
|
|
|
2009-07-26 03:59:59 +04:00
|
|
|
Rebase uses repeated merging to graft changesets from one part of
|
2010-03-10 05:53:16 +03:00
|
|
|
history (the source) onto another (the destination). This can be
|
2010-05-17 23:16:35 +04:00
|
|
|
useful for linearizing *local* changes relative to a master
|
2010-03-10 05:53:16 +03:00
|
|
|
development tree.
|
|
|
|
|
2010-05-17 23:16:35 +04:00
|
|
|
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.
|
|
|
|
|
2013-02-01 06:01:26 +04:00
|
|
|
In its default configuration, Mercurial will prevent you from
|
|
|
|
rebasing published changes. See :hg:`help phases` for details.
|
|
|
|
|
2010-03-10 05:53:16 +03:00
|
|
|
If you don't specify a destination changeset (``-d/--dest``),
|
2013-07-12 04:26:34 +04:00
|
|
|
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.)
|
2010-03-10 05:53:16 +03:00
|
|
|
|
|
|
|
You can specify which changesets to rebase in two ways: as a
|
2010-03-12 02:45:27 +03:00
|
|
|
"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.
|
2010-03-10 05:53:16 +03:00
|
|
|
|
2013-02-01 05:01:11 +04:00
|
|
|
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.
|
|
|
|
|
2010-03-10 05:53:16 +03:00
|
|
|
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
|
2013-07-12 04:26:34 +04:00
|
|
|
nothing if you are at the branch tip of a named branch
|
2010-03-10 05:53:16 +03:00
|
|
|
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).
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2009-04-05 01:19:11 +04:00
|
|
|
If a rebase is interrupted to manually resolve a merge, it can be
|
2009-04-18 16:40:21 +04:00
|
|
|
continued with --continue/-c or aborted with --abort/-a.
|
2010-05-21 00:58:16 +04:00
|
|
|
|
2014-10-08 23:03:07 +04:00
|
|
|
.. container:: verbose
|
|
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
|
|
- move "local changes" (current commit back to branching point)
|
|
|
|
to the current branch tip after a pull::
|
|
|
|
|
|
|
|
hg rebase
|
|
|
|
|
|
|
|
- move a single changeset to the stable branch::
|
|
|
|
|
|
|
|
hg rebase -r 5f493448 -d stable
|
|
|
|
|
|
|
|
- splice a commit and all its descendants onto another part of history::
|
|
|
|
|
|
|
|
hg rebase --source c0c3 --dest 4cf9
|
|
|
|
|
|
|
|
- rebase everything on a branch marked by a bookmark onto the
|
|
|
|
default branch::
|
|
|
|
|
|
|
|
hg rebase --base myfeature --dest default
|
|
|
|
|
|
|
|
- collapse a sequence of changes into a single commit::
|
|
|
|
|
|
|
|
hg rebase --collapse -r 1520:1525 -d .
|
|
|
|
|
|
|
|
- move a named branch while preserving its name::
|
|
|
|
|
|
|
|
hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
|
|
|
|
|
2013-10-26 19:24:25 +04:00
|
|
|
Returns 0 on success, 1 if nothing to rebase or there are
|
|
|
|
unresolved conflicts.
|
2014-10-08 23:03:07 +04:00
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
"""
|
2008-10-28 21:25:26 +03:00
|
|
|
originalwd = target = None
|
2013-03-12 02:37:28 +04:00
|
|
|
activebookmark = None
|
2008-08-18 23:16:31 +04:00
|
|
|
external = nullrev
|
2009-05-17 04:55:22 +04:00
|
|
|
state = {}
|
|
|
|
skipped = set()
|
2010-01-31 15:30:17 +03:00
|
|
|
targetancestors = set()
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2011-10-11 08:01:25 +04:00
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
lock = wlock = None
|
|
|
|
try:
|
|
|
|
wlock = repo.wlock()
|
2012-01-13 04:19:07 +04:00
|
|
|
lock = repo.lock()
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
# Validate input and define rebasing points
|
|
|
|
destf = opts.get('dest', None)
|
|
|
|
srcf = opts.get('source', None)
|
|
|
|
basef = opts.get('base', None)
|
2011-10-15 22:12:32 +04:00
|
|
|
revf = opts.get('rev', [])
|
2008-08-18 23:16:31 +04:00
|
|
|
contf = opts.get('continue')
|
|
|
|
abortf = opts.get('abort')
|
|
|
|
collapsef = opts.get('collapse', False)
|
2011-06-08 15:54:52 +04:00
|
|
|
collapsemsg = cmdutil.logmessage(ui, opts)
|
2013-10-01 22:28:18 +04:00
|
|
|
e = opts.get('extrafn') # internal, used by e.g. hgsubversion
|
2013-10-01 22:48:53 +04:00
|
|
|
extrafns = [_savegraft]
|
2013-10-01 22:28:18 +04:00
|
|
|
if e:
|
|
|
|
extrafns = [e]
|
2009-03-29 16:43:49 +04:00
|
|
|
keepf = opts.get('keep', False)
|
|
|
|
keepbranchesf = opts.get('keepbranches', False)
|
2010-02-07 19:12:41 +03:00
|
|
|
# keepopen is not meant for use on the command line, but by
|
|
|
|
# other extensions
|
|
|
|
keepopen = opts.get('keepopen', False)
|
2008-11-19 06:46:01 +03:00
|
|
|
|
2014-09-01 13:48:55 +04:00
|
|
|
if opts.get('interactive'):
|
|
|
|
msg = _("interactive history editing is supported by the "
|
|
|
|
"'histedit' extension (see 'hg help histedit')")
|
|
|
|
raise util.Abort(msg)
|
|
|
|
|
2011-03-15 20:33:36 +03:00
|
|
|
if collapsemsg and not collapsef:
|
|
|
|
raise util.Abort(
|
|
|
|
_('message can only be specified with collapse'))
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
if contf or abortf:
|
|
|
|
if contf and abortf:
|
2010-06-05 02:22:33 +04:00
|
|
|
raise util.Abort(_('cannot use both abort and continue'))
|
2008-08-18 23:16:31 +04:00
|
|
|
if collapsef:
|
2010-06-05 02:22:33 +04:00
|
|
|
raise util.Abort(
|
|
|
|
_('cannot use collapse with continue or abort'))
|
2009-04-22 03:39:47 +04:00
|
|
|
if srcf or basef or destf:
|
2010-06-05 02:22:33 +04:00
|
|
|
raise util.Abort(
|
2008-08-18 23:16:31 +04:00
|
|
|
_('abort and continue do not allow specifying revisions'))
|
2011-04-02 13:07:05 +04:00
|
|
|
if opts.get('tool', False):
|
|
|
|
ui.warn(_('tool option will be ignored\n'))
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2013-09-30 19:35:07 +04:00
|
|
|
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')
|
2014-01-23 04:21:08 +04:00
|
|
|
hint = _('use "hg rebase --abort" to clear broken state')
|
2013-09-30 19:35:07 +04:00
|
|
|
raise util.Abort(msg, hint=hint)
|
2008-08-18 23:16:31 +04:00
|
|
|
if abortf:
|
2010-05-21 00:58:16 +04:00
|
|
|
return abort(repo, originalwd, target, state)
|
2008-08-18 23:16:31 +04:00
|
|
|
else:
|
|
|
|
if srcf and basef:
|
2010-06-05 02:22:33 +04:00
|
|
|
raise util.Abort(_('cannot specify both a '
|
2011-10-15 22:12:32 +04:00
|
|
|
'source and a base'))
|
|
|
|
if revf and basef:
|
2011-10-17 20:47:36 +04:00
|
|
|
raise util.Abort(_('cannot specify both a '
|
2010-06-05 02:22:33 +04:00
|
|
|
'revision and a base'))
|
2011-10-15 22:12:32 +04:00
|
|
|
if revf and srcf:
|
2011-10-17 20:47:36 +04:00
|
|
|
raise util.Abort(_('cannot specify both a '
|
2011-10-15 22:12:32 +04:00
|
|
|
'revision and a source'))
|
2010-02-06 12:51:50 +03:00
|
|
|
|
2013-07-25 08:51:44 +04:00
|
|
|
cmdutil.checkunfinished(repo)
|
2011-05-11 01:08:46 +04:00
|
|
|
cmdutil.bailifchanged(repo)
|
2011-10-15 21:07:51 +04:00
|
|
|
|
|
|
|
if not destf:
|
2011-10-15 22:12:32 +04:00
|
|
|
# Destination defaults to the latest revision in the
|
|
|
|
# current branch
|
2011-10-15 21:07:51 +04:00
|
|
|
branch = repo[None].branch()
|
|
|
|
dest = repo[branch]
|
|
|
|
else:
|
2012-05-01 12:14:35 +04:00
|
|
|
dest = scmutil.revsingle(repo, destf)
|
2011-10-15 21:07:51 +04:00
|
|
|
|
2011-10-15 23:19:07 +04:00
|
|
|
if revf:
|
2013-09-03 23:12:35 +04:00
|
|
|
rebaseset = scmutil.revrange(repo, revf)
|
2013-11-17 00:46:29 +04:00
|
|
|
if not rebaseset:
|
2014-04-23 15:51:35 +04:00
|
|
|
ui.status(_('empty "rev" revision set - '
|
|
|
|
'nothing to rebase\n'))
|
|
|
|
return 1
|
2011-10-15 23:19:07 +04:00
|
|
|
elif srcf:
|
2012-01-08 19:09:35 +04:00
|
|
|
src = scmutil.revrange(repo, [srcf])
|
2013-11-18 03:21:58 +04:00
|
|
|
if not src:
|
2014-05-01 18:47:50 +04:00
|
|
|
ui.status(_('empty "source" revision set - '
|
|
|
|
'nothing to rebase\n'))
|
|
|
|
return 1
|
2012-01-10 06:16:57 +04:00
|
|
|
rebaseset = repo.revs('(%ld)::', src)
|
2013-11-18 03:21:58 +04:00
|
|
|
assert rebaseset
|
2011-10-15 21:07:51 +04:00
|
|
|
else:
|
2012-01-08 19:09:35 +04:00
|
|
|
base = scmutil.revrange(repo, [basef or '.'])
|
2013-11-18 03:21:58 +04:00
|
|
|
if not base:
|
2014-05-01 18:47:50 +04:00
|
|
|
ui.status(_('empty "base" revision set - '
|
|
|
|
"can't compute rebase set\n"))
|
|
|
|
return 1
|
2014-10-21 05:50:09 +04:00
|
|
|
commonanc = repo.revs('ancestor(%ld, %d)', base, dest).first()
|
2014-11-10 21:44:42 +03:00
|
|
|
if commonanc is not None:
|
|
|
|
rebaseset = repo.revs('(%d::(%ld) - %d)::',
|
|
|
|
commonanc, base, commonanc)
|
|
|
|
else:
|
|
|
|
rebaseset = []
|
|
|
|
|
2013-11-18 03:21:58 +04:00
|
|
|
if not rebaseset:
|
2014-10-07 11:31:53 +04:00
|
|
|
# transform to list because smartsets are not comparable to
|
2014-04-18 00:47:38 +04:00
|
|
|
# lists. This should be improved to honor laziness of
|
2014-10-07 11:31:53 +04:00
|
|
|
# smartset.
|
|
|
|
if list(base) == [dest.rev()]:
|
2013-11-18 03:21:58 +04:00
|
|
|
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
|
2011-12-27 03:11:22 +04:00
|
|
|
|
2014-10-15 00:25:13 +04:00
|
|
|
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
|
|
|
|
if (not (keepf or allowunstable)
|
2012-12-04 17:58:19 +04:00
|
|
|
and repo.revs('first(children(%ld) - %ld)',
|
2013-01-01 03:45:52 +04:00
|
|
|
rebaseset, rebaseset)):
|
2011-10-15 23:19:24 +04:00
|
|
|
raise util.Abort(
|
|
|
|
_("can't remove original changesets with"
|
|
|
|
" unrebased descendants"),
|
|
|
|
hint=_('use --keep to keep original changesets'))
|
|
|
|
|
2013-11-17 00:46:29 +04:00
|
|
|
result = buildstate(repo, dest, rebaseset, collapsef)
|
2010-01-31 15:30:17 +03:00
|
|
|
if not result:
|
|
|
|
# Empty state built, nothing to rebase
|
2009-05-25 00:37:20 +04:00
|
|
|
ui.status(_('nothing to rebase\n'))
|
2010-05-21 00:58:16 +04:00
|
|
|
return 1
|
2013-11-17 00:46:29 +04:00
|
|
|
|
|
|
|
root = min(rebaseset)
|
|
|
|
if not keepf and not repo[root].mutable():
|
2013-04-19 01:28:06 +04:00
|
|
|
raise util.Abort(_("can't rebase immutable changeset %s")
|
|
|
|
% repo[root],
|
|
|
|
hint=_('see hg help phases for details'))
|
2013-11-17 00:46:29 +04:00
|
|
|
|
|
|
|
originalwd, target, state = result
|
|
|
|
if collapsef:
|
|
|
|
targetancestors = repo.changelog.ancestors([target],
|
|
|
|
inclusive=True)
|
|
|
|
external = externalparent(repo, state, targetancestors)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2013-11-26 06:18:56 +04:00
|
|
|
if dest.closesbranch() and not keepbranchesf:
|
|
|
|
ui.status(_('reopening closed branch head %s\n') % dest)
|
|
|
|
|
2009-03-29 16:43:49 +04:00
|
|
|
if keepbranchesf:
|
2013-10-01 22:28:18 +04:00
|
|
|
# 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)
|
2011-07-19 00:58:21 +04:00
|
|
|
if collapsef:
|
|
|
|
branches = set()
|
|
|
|
for rev in state:
|
|
|
|
branches.add(repo[rev].branch())
|
|
|
|
if len(branches) > 1:
|
2011-07-22 00:56:15 +04:00
|
|
|
raise util.Abort(_('cannot collapse multiple named '
|
2011-07-19 00:58:21 +04:00
|
|
|
'branches'))
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
# Rebase
|
2010-01-31 15:30:17 +03:00
|
|
|
if not targetancestors:
|
2012-12-18 08:51:21 +04:00
|
|
|
targetancestors = repo.changelog.ancestors([target], inclusive=True)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2011-07-15 22:07:19 +04:00
|
|
|
# Keep track of the current bookmarks in order to reset them later
|
|
|
|
currentbookmarks = repo._bookmarks.copy()
|
2013-03-12 02:37:28 +04:00
|
|
|
activebookmark = activebookmark or repo._bookmarkcurrent
|
2012-06-22 22:40:31 +04:00
|
|
|
if activebookmark:
|
|
|
|
bookmarks.unsetcurrent(repo)
|
2011-07-15 22:07:19 +04:00
|
|
|
|
2013-10-01 22:28:18 +04:00
|
|
|
extrafn = _makeextrafn(extrafns)
|
|
|
|
|
2010-07-20 22:53:48 +04:00
|
|
|
sortedstate = sorted(state)
|
|
|
|
total = len(sortedstate)
|
|
|
|
pos = 0
|
|
|
|
for rev in sortedstate:
|
2014-12-09 05:45:26 +03:00
|
|
|
ctx = repo[rev]
|
|
|
|
desc = '%d:%s "%s"' % (ctx.rev(), ctx,
|
|
|
|
ctx.description().split('\n', 1)[0])
|
|
|
|
names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
|
|
|
|
if names:
|
|
|
|
desc += ' (%s)' % ' '.join(names)
|
2010-07-20 22:53:48 +04:00
|
|
|
pos += 1
|
2014-12-02 20:46:20 +03:00
|
|
|
if state[rev] == revtodo:
|
2014-12-09 05:45:26 +03:00
|
|
|
ui.status(_('rebasing %s\n') % desc)
|
|
|
|
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
|
2010-07-20 22:53:48 +04:00
|
|
|
_('changesets'), total)
|
2014-11-19 05:38:51 +03:00
|
|
|
p1, p2, base = defineparents(repo, rev, target, state,
|
|
|
|
targetancestors)
|
2013-07-25 08:51:44 +04:00
|
|
|
storestatus(repo, originalwd, target, state, collapsef, keepf,
|
|
|
|
keepbranchesf, external, activebookmark)
|
2010-01-31 15:30:17 +03:00
|
|
|
if len(repo.parents()) == 2:
|
|
|
|
repo.ui.debug('resuming interrupted rebase\n')
|
|
|
|
else:
|
2011-04-02 13:07:05 +04:00
|
|
|
try:
|
2014-03-19 05:45:14 +04:00
|
|
|
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
|
|
|
|
'rebase')
|
2014-11-19 05:38:51 +03:00
|
|
|
stats = rebasenode(repo, rev, p1, base, state,
|
|
|
|
collapsef, target)
|
2011-04-02 13:07:05 +04:00
|
|
|
if stats and stats[3] > 0:
|
2013-02-09 02:27:59 +04:00
|
|
|
raise error.InterventionRequired(
|
|
|
|
_('unresolved conflicts (see hg '
|
|
|
|
'resolve, then hg rebase --continue)'))
|
2011-04-02 13:07:05 +04:00
|
|
|
finally:
|
2014-03-19 05:45:14 +04:00
|
|
|
ui.setconfig('ui', 'forcemerge', '', 'rebase')
|
2010-01-31 15:30:17 +03:00
|
|
|
if not collapsef:
|
2014-12-02 07:12:59 +03:00
|
|
|
merging = p2 != nullrev
|
2014-08-16 05:43:59 +04:00
|
|
|
editform = cmdutil.mergeeditform(merging, 'rebase')
|
|
|
|
editor = cmdutil.getcommiteditor(editform=editform, **opts)
|
2014-12-02 07:12:53 +03:00
|
|
|
newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn,
|
|
|
|
editor=editor)
|
2010-01-31 15:30:17 +03:00
|
|
|
else:
|
|
|
|
# Skip commit if we are collapsing
|
2014-09-05 22:36:20 +04:00
|
|
|
repo.dirstate.beginparentchange()
|
2012-04-30 00:25:55 +04:00
|
|
|
repo.setparents(repo[p1].node())
|
2014-09-05 22:36:20 +04:00
|
|
|
repo.dirstate.endparentchange()
|
2014-12-02 07:12:53 +03:00
|
|
|
newnode = None
|
2010-01-31 15:30:17 +03:00
|
|
|
# Update the state
|
2014-12-02 07:12:53 +03:00
|
|
|
if newnode is not None:
|
|
|
|
state[rev] = repo[newnode].rev()
|
2014-12-10 08:20:35 +03:00
|
|
|
ui.debug('rebased as %s\n' % short(newnode))
|
2010-01-31 15:30:17 +03:00
|
|
|
else:
|
2014-12-10 08:20:35 +03:00
|
|
|
ui.warn(_('note: rebase of %d:%s created no changes '
|
|
|
|
'to commit\n') % (rev, ctx))
|
2010-01-31 15:30:17 +03:00
|
|
|
if not collapsef:
|
|
|
|
skipped.add(rev)
|
|
|
|
state[rev] = p1
|
2014-12-10 08:20:35 +03:00
|
|
|
ui.debug('next revision set to %s\n' % p1)
|
2014-12-09 05:45:26 +03:00
|
|
|
elif state[rev] == nullmerge:
|
2014-12-10 08:20:35 +03:00
|
|
|
ui.debug('ignoring null merge rebase of %s\n' % rev)
|
2014-12-09 05:45:26 +03:00
|
|
|
elif state[rev] == revignored:
|
|
|
|
ui.status(_('not rebasing ignored %s\n') % desc)
|
|
|
|
else:
|
|
|
|
ui.status(_('already rebased %s as %s\n') %
|
|
|
|
(desc, repo[state[rev]]))
|
2010-01-31 15:30:17 +03:00
|
|
|
|
2010-07-20 22:53:48 +04:00
|
|
|
ui.progress(_('rebasing'), None)
|
2008-08-18 23:16:31 +04:00
|
|
|
ui.note(_('rebase merging completed\n'))
|
|
|
|
|
2010-02-07 19:12:41 +03:00
|
|
|
if collapsef and not keepopen:
|
2014-11-19 05:38:51 +03:00
|
|
|
p1, p2, _base = defineparents(repo, min(state), target,
|
|
|
|
state, targetancestors)
|
2014-08-15 18:05:53 +04:00
|
|
|
editopt = opts.get('edit')
|
|
|
|
editform = 'rebase.collapse'
|
2011-03-15 20:33:36 +03:00
|
|
|
if collapsemsg:
|
|
|
|
commitmsg = collapsemsg
|
|
|
|
else:
|
|
|
|
commitmsg = 'Collapsed revision'
|
|
|
|
for rebased in state:
|
2013-01-19 02:21:32 +04:00
|
|
|
if rebased not in skipped and state[rebased] > nullmerge:
|
2011-03-15 20:33:36 +03:00
|
|
|
commitmsg += '\n* %s' % repo[rebased].description()
|
2014-08-15 18:05:53 +04:00
|
|
|
editopt = True
|
|
|
|
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
|
2014-12-02 07:12:53 +03:00
|
|
|
newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
|
|
|
|
extrafn=extrafn, editor=editor)
|
2014-12-02 07:12:59 +03:00
|
|
|
if newnode is None:
|
|
|
|
newrev = target
|
|
|
|
else:
|
|
|
|
newrev = repo[newnode].rev()
|
2013-11-02 04:08:06 +04:00
|
|
|
for oldrev in state.iterkeys():
|
|
|
|
if state[oldrev] > nullmerge:
|
2014-12-02 07:12:59 +03:00
|
|
|
state[oldrev] = newrev
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
if 'qtip' in repo.tags():
|
|
|
|
updatemq(repo, state, skipped, **opts)
|
|
|
|
|
2011-07-15 22:07:19 +04:00
|
|
|
if currentbookmarks:
|
|
|
|
# Nodeids are needed to reset bookmarks
|
|
|
|
nstate = {}
|
|
|
|
for k, v in state.iteritems():
|
2013-01-19 02:21:32 +04:00
|
|
|
if v > nullmerge:
|
2011-07-15 22:07:19 +04:00
|
|
|
nstate[repo[k].node()] = repo[v].node()
|
2013-02-04 02:26:39 +04:00
|
|
|
# XXX this is the same as dest.node() for the non-continue path --
|
|
|
|
# this should probably be cleaned up
|
|
|
|
targetnode = repo[target].node()
|
2011-07-15 22:07:19 +04:00
|
|
|
|
2013-10-14 18:12:29 +04:00
|
|
|
# restore original working directory
|
|
|
|
# (we do this before stripping)
|
|
|
|
newwd = state.get(originalwd, originalwd)
|
2014-12-02 22:06:38 +03:00
|
|
|
if newwd < 0:
|
|
|
|
# original directory is a parent of rebase set root or ignored
|
|
|
|
newwd = originalwd
|
2013-10-14 18:12:29 +04:00
|
|
|
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)
|
|
|
|
|
2009-03-29 16:43:49 +04:00
|
|
|
if not keepf:
|
2012-09-19 01:42:27 +04:00
|
|
|
collapsedas = None
|
|
|
|
if collapsef:
|
2014-12-02 07:12:53 +03:00
|
|
|
collapsedas = newnode
|
rebase: do not invent successor to skipped changeset
When rebase results in an empty a changeset it is "skipped" and no related
changeset is created at all. When we added obsolescence support to rebase (in
cee0a253a56c) it seemed a good idea to use its parent successor as the
successors for such dropped changesets. (see old version of the altered test).
This option was chosen because it seems a good way to hint about were the
dropped changeset "intended" to be. Such hint would have been used by automatic
evolution mechanism to rebase potential unstable children.
However, field testing of this version are not conclusive. It very often leads
to the creation of (totally unfounded) evolution divergence. This changeset
changes this behavior and mark skipped changesets as pruned (obsolete without
successors). This prevents the issue and seems semantically better probably a
win for obsolescence reading tool.
See example bellow for details:
User Babar has five changesets of interest:
- O, its current base of development.
- U, the new upstream
- A and C, some development changesets
- B another development changeset independent from A
O - A - B - C
\
U
Babar decides that B is more critical than the A and C and rebase it first
$ hg rebase --rev B --dest U
B is now obsolete (in lower case bellow). Rebase result, B', is its
successors.(note, C is unstable)
O - A - b - C
\
U - B'
Babar is now done with B', and want to rebase the rest of its history:
$ hg rebase --source A --dest B'
hg rebase process A, B and C. B is skipped as all its changes are already contained
in B'.
O - U - B' - A' - C'
Babar have the expected result graph wise, obsolescence marker are as follow:
B -> B' (from first rebase)
A -> A' (from second rebase)
C -> C' (from second rebase)
B -> ?? (from second rebase)
Before this changeset, the last marker is `B -> A'`. This cause two issues:
- This is semantically wrong. B have nothing to do with A'
- B has now two successors sets: (B',) and (A',). We detect a divergent
rewriting. The B' and A' are reported as "divergent" to Babar, confusion
ensues. In addition such divergent situation (divergent changeset are children
to each other) is tricky to solve.
With this changeset the last marker is `B -> ø`:
- This is semantically better.
- B has a single successors set (B',)
This scenario is added to the tests suite.
2013-01-18 17:15:32 +04:00
|
|
|
clearrebased(ui, repo, state, skipped, collapsedas)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2011-07-15 22:07:19 +04:00
|
|
|
if currentbookmarks:
|
2013-02-04 02:26:39 +04:00
|
|
|
updatebookmarks(repo, targetnode, nstate, currentbookmarks)
|
2014-02-15 11:19:19 +04:00
|
|
|
if activebookmark not in repo._bookmarks:
|
|
|
|
# active bookmark was divergent one and has been deleted
|
|
|
|
activebookmark = None
|
2011-07-15 22:07:19 +04:00
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
clearstatus(repo)
|
2010-05-21 00:15:11 +04:00
|
|
|
ui.note(_("rebase completed\n"))
|
2013-01-16 02:30:10 +04:00
|
|
|
util.unlinkpath(repo.sjoin('undo'), ignoremissing=True)
|
2008-08-18 23:16:31 +04:00
|
|
|
if skipped:
|
|
|
|
ui.note(_("%d revisions have been skipped\n") % len(skipped))
|
2012-06-22 22:40:31 +04:00
|
|
|
|
|
|
|
if (activebookmark and
|
2013-10-14 19:12:59 +04:00
|
|
|
repo['.'].node() == repo._bookmarks[activebookmark]):
|
2012-06-22 22:40:31 +04:00
|
|
|
bookmarks.setcurrent(repo, activebookmark)
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
finally:
|
2009-04-22 04:01:22 +04:00
|
|
|
release(lock, wlock)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2013-10-24 08:05:22 +04:00
|
|
|
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.
|
2010-01-31 15:30:17 +03:00
|
|
|
"""
|
2013-10-24 08:05:22 +04:00
|
|
|
parents = set()
|
2010-01-31 15:30:17 +03:00
|
|
|
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):
|
2013-10-24 08:05:22 +04:00
|
|
|
parents.add(p.rev())
|
|
|
|
if not parents:
|
|
|
|
return nullrev
|
|
|
|
if len(parents) == 1:
|
|
|
|
return parents.pop()
|
2013-10-23 19:42:13 +04:00
|
|
|
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))))
|
2010-01-31 15:30:17 +03:00
|
|
|
|
2011-10-11 08:01:25 +04:00
|
|
|
def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None):
|
2014-11-19 05:38:51 +03:00
|
|
|
'''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
|
|
|
|
but also store useful information in extra.
|
2014-12-02 07:12:53 +03:00
|
|
|
Return node of committed revision.'''
|
2008-08-18 23:16:31 +04:00
|
|
|
try:
|
2014-09-05 22:36:20 +04:00
|
|
|
repo.dirstate.beginparentchange()
|
2012-04-30 00:25:55 +04:00
|
|
|
repo.setparents(repo[p1].node(), repo[p2].node())
|
2014-09-05 22:36:20 +04:00
|
|
|
repo.dirstate.endparentchange()
|
2010-03-23 22:45:08 +03:00
|
|
|
ctx = repo[rev]
|
2010-07-12 14:04:07 +04:00
|
|
|
if commitmsg is None:
|
|
|
|
commitmsg = ctx.description()
|
2010-03-23 22:45:08 +03:00
|
|
|
extra = {'rebase_source': ctx.hex()}
|
|
|
|
if extrafn:
|
|
|
|
extrafn(ctx, extra)
|
2014-08-06 00:22:44 +04:00
|
|
|
|
|
|
|
backup = repo.ui.backupconfig('phases', 'new-commit')
|
|
|
|
try:
|
|
|
|
targetphase = max(ctx.phase(), phases.draft)
|
|
|
|
repo.ui.setconfig('phases', 'new-commit', targetphase, 'rebase')
|
|
|
|
# Commit might fail if unresolved files exist
|
2014-12-02 07:12:53 +03:00
|
|
|
newnode = repo.commit(text=commitmsg, user=ctx.user(),
|
|
|
|
date=ctx.date(), extra=extra, editor=editor)
|
2014-08-06 00:22:44 +04:00
|
|
|
finally:
|
|
|
|
repo.ui.restoreconfig(backup)
|
|
|
|
|
2014-12-02 07:12:53 +03:00
|
|
|
repo.dirstate.setbranch(repo[newnode].branch())
|
|
|
|
return newnode
|
2008-08-18 23:16:31 +04:00
|
|
|
except util.Abort:
|
|
|
|
# Invalidate the previous setparents
|
|
|
|
repo.dirstate.invalidate()
|
|
|
|
raise
|
|
|
|
|
2014-11-19 05:38:51 +03:00
|
|
|
def rebasenode(repo, rev, p1, base, state, collapse, target):
|
|
|
|
'Rebase a single revision rev on top of p1 using base as merge ancestor'
|
2008-08-18 23:16:31 +04:00
|
|
|
# Merge phase
|
2010-01-31 15:30:17 +03:00
|
|
|
# Update to target and merge it with local
|
2014-12-02 07:12:59 +03:00
|
|
|
if repo['.'].rev() != p1:
|
|
|
|
repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
|
2010-01-31 15:30:17 +03:00
|
|
|
merge.update(repo, p1, False, True, False)
|
2008-08-18 23:16:31 +04:00
|
|
|
else:
|
2010-01-31 15:30:17 +03:00
|
|
|
repo.ui.debug(" already in target\n")
|
|
|
|
repo.dirstate.write()
|
2014-12-02 07:12:59 +03:00
|
|
|
repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
|
2013-10-30 22:45:14 +04:00
|
|
|
if base is not None:
|
2014-12-02 07:12:59 +03:00
|
|
|
repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))
|
rebase: allow collapsing branches in place (issue3111)
We allow rebase plus collapse, but not collapse only? I imagine people would
rebase first then collapse once they are sure the rebase is correct and it is
the right time to finish it.
I was reluctant to submit this patch for reasons detailed below, but it
improves rebase --collapse usefulness so much it is worth the ugliness.
The fix is ugly because we should be fixing the collapse code path rather than
the merge. Collapsing by merging changesets repeatedly is inefficient compared
to what commit --amend does: commitctx(), update, strip. The problem with the
latter is, to generate the synthetic changeset, copy records are gathered with
copies.pathcopies(). copies.pathcopies() is still implemented with merging in
mind and discards information like file replaced by the copy of another,
criss-cross copies and so forth. I believe this information should not be lost,
even if we decide not to interpret it fully later, at merge time.
The second issue with improving rebase --collapse is the option should not be
there to begin with. Rebasing and collapsing are orthogonal and a dedicated
command would probably enable a better, simpler ui. We should avoid advertizing
rebase --collapse, but with this fix it becomes the best shipped solution to
collapse changesets.
And for the record, available techniques are:
- revert + commit + strip: lose copies
- mq/qfold: repeated patching() (mostly correct, fragile)
- rebase: repeated merges (mostly correct, fragile)
- collapse: revert + tag rewriting wizardry, lose copies
- histedit: repeated patching() (mostly correct, fragile)
- amend: copies.pathcopies() + commitctx() + update + strip
2012-05-03 17:14:58 +04:00
|
|
|
# When collapsing in-place, the parent is the common ancestor, we
|
|
|
|
# have to allow merging with it.
|
2014-10-14 02:55:45 +04:00
|
|
|
stats = merge.update(repo, rev, True, True, False, base, collapse,
|
2014-05-09 03:55:56 +04:00
|
|
|
labels=['dest', 'source'])
|
2014-10-14 02:55:45 +04:00
|
|
|
if collapse:
|
|
|
|
copies.duplicatecopies(repo, rev, target)
|
|
|
|
else:
|
|
|
|
# If we're not using --collapse, we need to
|
|
|
|
# duplicate copies between the revision we're
|
|
|
|
# rebasing and its first parent, but *not*
|
|
|
|
# duplicate any copies that have already been
|
|
|
|
# performed in the destination.
|
|
|
|
p1rev = repo[rev].p1().rev()
|
|
|
|
copies.duplicatecopies(repo, rev, p1rev, skiprev=target)
|
|
|
|
return stats
|
2008-08-21 13:35:17 +04:00
|
|
|
|
2013-01-19 02:41:48 +04:00
|
|
|
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:
|
2014-10-07 11:16:59 +04:00
|
|
|
return state[candidates.first()]
|
2013-01-19 02:41:48 +04:00
|
|
|
else:
|
|
|
|
return None
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
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
|
|
|
|
|
2014-10-14 03:00:39 +04:00
|
|
|
p1n = parents[0].rev()
|
|
|
|
if p1n in targetancestors:
|
2008-08-18 23:16:31 +04:00
|
|
|
p1 = target
|
2014-10-14 03:00:39 +04:00
|
|
|
elif p1n in state:
|
|
|
|
if state[p1n] == nullmerge:
|
2010-02-06 12:51:50 +03:00
|
|
|
p1 = target
|
2014-10-14 03:00:39 +04:00
|
|
|
elif state[p1n] == revignored:
|
|
|
|
p1 = nearestrebased(repo, p1n, state)
|
2013-01-19 02:41:48 +04:00
|
|
|
if p1 is None:
|
|
|
|
p1 = target
|
2010-02-06 12:51:50 +03:00
|
|
|
else:
|
2014-10-14 03:00:39 +04:00
|
|
|
p1 = state[p1n]
|
|
|
|
else: # p1n external
|
2008-08-18 23:16:31 +04:00
|
|
|
p1 = target
|
2014-10-14 03:00:39 +04:00
|
|
|
p2 = p1n
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
if len(parents) == 2 and parents[1].rev() not in targetancestors:
|
2014-10-14 03:00:39 +04:00
|
|
|
p2n = parents[1].rev()
|
2008-08-18 23:16:31 +04:00
|
|
|
# interesting second parent
|
2014-10-14 03:00:39 +04:00
|
|
|
if p2n in state:
|
|
|
|
if p1 == target: # p1n in targetancestors or external
|
|
|
|
p1 = state[p2n]
|
|
|
|
elif state[p2n] == revignored:
|
|
|
|
p2 = nearestrebased(repo, p2n, state)
|
2013-01-19 02:41:48 +04:00
|
|
|
if p2 is None:
|
|
|
|
# no ancestors rebased yet, detach
|
|
|
|
p2 = target
|
2008-08-18 23:16:31 +04:00
|
|
|
else:
|
2014-10-14 03:00:39 +04:00
|
|
|
p2 = state[p2n]
|
|
|
|
else: # p2n external
|
|
|
|
if p2 != nullrev: # p1n external too => rev is a merged revision
|
2008-08-18 23:16:31 +04:00
|
|
|
raise util.Abort(_('cannot use revision %d as base, result '
|
|
|
|
'would have 3 parents') % rev)
|
2014-10-14 03:00:39 +04:00
|
|
|
p2 = p2n
|
2010-01-31 15:30:17 +03:00
|
|
|
repo.ui.debug(" future parents are %d and %d\n" %
|
|
|
|
(repo[p1].rev(), repo[p2].rev()))
|
2014-11-19 05:38:51 +03:00
|
|
|
|
|
|
|
if rev == min(state):
|
|
|
|
# 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
|
|
|
|
base = repo[rev].p1().rev()
|
|
|
|
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()) == p1:
|
|
|
|
base = p.rev()
|
|
|
|
break
|
|
|
|
else: # fallback when base not found
|
|
|
|
base = None
|
|
|
|
|
|
|
|
# Raise because this function is called wrong (see issue 4106)
|
|
|
|
raise AssertionError('no base found to rebase on '
|
|
|
|
'(defineparents called wrong)')
|
|
|
|
return p1, p2, base
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2009-03-26 17:58:50 +03:00
|
|
|
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
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
def updatemq(repo, state, skipped, **opts):
|
|
|
|
'Update rebased mq patches - finalize and then import them'
|
|
|
|
mqrebase = {}
|
2010-07-12 14:04:07 +04:00
|
|
|
mq = repo.mq
|
2011-06-13 13:06:11 +04:00
|
|
|
original_series = mq.fullseries[:]
|
2012-04-25 19:04:18 +04:00
|
|
|
skippedpatches = set()
|
2011-03-26 15:05:17 +03:00
|
|
|
|
2010-07-12 14:04:07 +04:00
|
|
|
for p in mq.applied:
|
|
|
|
rev = repo[p.node].rev()
|
|
|
|
if rev in state:
|
2009-09-19 03:15:38 +04:00
|
|
|
repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' %
|
2010-07-12 14:04:07 +04:00
|
|
|
(rev, p.name))
|
|
|
|
mqrebase[rev] = (p.name, isagitpatch(repo, p.name))
|
2012-04-25 19:04:18 +04:00
|
|
|
else:
|
|
|
|
# Applied but not rebased, not sure this should happen
|
|
|
|
skippedpatches.add(p.name)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
if mqrebase:
|
2010-07-12 14:04:07 +04:00
|
|
|
mq.finish(repo, mqrebase.keys())
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
# We must start import from the newest revision
|
2009-04-27 01:50:44 +04:00
|
|
|
for rev in sorted(mqrebase, reverse=True):
|
2008-08-18 23:16:31 +04:00
|
|
|
if rev not in skipped:
|
2010-07-12 14:04:07 +04:00
|
|
|
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])])
|
2012-04-25 19:04:18 +04:00
|
|
|
else:
|
|
|
|
# Rebased and skipped
|
|
|
|
skippedpatches.add(mqrebase[rev][0])
|
|
|
|
|
|
|
|
# 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
|
2011-06-13 14:02:14 +04:00
|
|
|
mq.savedirty()
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2013-02-04 02:26:39 +04:00
|
|
|
def updatebookmarks(repo, targetnode, nstate, originalbookmarks):
|
2013-01-31 04:08:32 +04:00
|
|
|
'Move bookmarks to their correct changesets, and delete divergent ones'
|
2012-11-08 02:21:39 +04:00
|
|
|
marks = repo._bookmarks
|
2011-07-15 22:07:19 +04:00
|
|
|
for k, v in originalbookmarks.iteritems():
|
|
|
|
if v in nstate:
|
2013-01-31 05:49:54 +04:00
|
|
|
# update the bookmarks for revs that have moved
|
|
|
|
marks[k] = nstate[v]
|
2013-02-04 02:26:39 +04:00
|
|
|
bookmarks.deletedivergent(repo, [targetnode], k)
|
2011-07-15 22:07:19 +04:00
|
|
|
|
2012-11-08 02:21:39 +04:00
|
|
|
marks.write()
|
2011-07-15 22:07:19 +04:00
|
|
|
|
2009-03-29 16:43:49 +04:00
|
|
|
def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches,
|
2013-03-12 02:37:28 +04:00
|
|
|
external, activebookmark):
|
2008-08-18 23:16:31 +04:00
|
|
|
'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))
|
2009-03-29 16:43:49 +04:00
|
|
|
f.write('%d\n' % int(keep))
|
|
|
|
f.write('%d\n' % int(keepbranches))
|
2013-03-12 02:37:28 +04:00
|
|
|
f.write('%s\n' % (activebookmark or ''))
|
2009-01-12 11:16:03 +03:00
|
|
|
for d, v in state.iteritems():
|
2008-08-18 23:16:31 +04:00
|
|
|
oldrev = repo[d].hex()
|
2014-12-02 23:23:12 +03:00
|
|
|
if v >= 0:
|
2011-11-07 02:35:33 +04:00
|
|
|
newrev = repo[v].hex()
|
2014-12-02 23:23:12 +03:00
|
|
|
elif v == revtodo:
|
|
|
|
# To maintain format compatibility, we have to use nullid.
|
|
|
|
# Please do remove this special case when upgrading the format.
|
|
|
|
newrev = hex(nullid)
|
2011-11-07 02:35:33 +04:00
|
|
|
else:
|
|
|
|
newrev = v
|
2008-08-18 23:16:31 +04:00
|
|
|
f.write("%s:%s\n" % (oldrev, newrev))
|
|
|
|
f.close()
|
2009-09-19 03:15:38 +04:00
|
|
|
repo.ui.debug('rebase status stored\n')
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
def clearstatus(repo):
|
|
|
|
'Remove the status files'
|
2013-01-16 02:30:10 +04:00
|
|
|
util.unlinkpath(repo.join("rebasestate"), ignoremissing=True)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
|
|
|
def restorestatus(repo):
|
|
|
|
'Restore a previously stored status'
|
|
|
|
try:
|
2014-01-30 23:56:56 +04:00
|
|
|
keepbranches = None
|
2008-08-18 23:16:31 +04:00
|
|
|
target = None
|
|
|
|
collapse = False
|
|
|
|
external = nullrev
|
2013-03-12 02:37:28 +04:00
|
|
|
activebookmark = None
|
2008-08-18 23:16:31 +04:00
|
|
|
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))
|
2009-03-29 16:43:49 +04:00
|
|
|
elif i == 4:
|
|
|
|
keep = bool(int(l))
|
|
|
|
elif i == 5:
|
|
|
|
keepbranches = bool(int(l))
|
2013-03-12 02:37:28 +04:00
|
|
|
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
|
2008-08-18 23:16:31 +04:00
|
|
|
else:
|
|
|
|
oldrev, newrev = l.split(':')
|
2013-01-19 02:41:48 +04:00
|
|
|
if newrev in (str(nullmerge), str(revignored)):
|
2011-11-07 02:35:33 +04:00
|
|
|
state[repo[oldrev].rev()] = int(newrev)
|
2014-12-02 23:23:12 +03:00
|
|
|
elif newrev == nullid:
|
|
|
|
state[repo[oldrev].rev()] = revtodo
|
|
|
|
# Legacy compat special case
|
2013-01-19 02:41:48 +04:00
|
|
|
else:
|
|
|
|
state[repo[oldrev].rev()] = repo[newrev].rev()
|
2014-01-30 23:56:56 +04:00
|
|
|
|
|
|
|
if keepbranches is None:
|
|
|
|
raise util.Abort(_('.hg/rebasestate is incomplete'))
|
|
|
|
|
2010-08-13 20:02:02 +04:00
|
|
|
skipped = set()
|
|
|
|
# recompute the set of skipped revs
|
|
|
|
if not collapse:
|
|
|
|
seen = set([target])
|
|
|
|
for old, new in sorted(state.items()):
|
2014-12-02 20:46:20 +03:00
|
|
|
if new != revtodo and new in seen:
|
2010-08-13 20:02:02 +04:00
|
|
|
skipped.add(old)
|
|
|
|
seen.add(new)
|
2014-02-20 05:39:01 +04:00
|
|
|
repo.ui.debug('computed skipped revs: %s\n' %
|
|
|
|
(' '.join(str(r) for r in sorted(skipped)) or None))
|
2009-09-19 03:15:38 +04:00
|
|
|
repo.ui.debug('rebase status resumed\n')
|
2010-08-13 20:02:02 +04:00
|
|
|
return (originalwd, target, state, skipped,
|
2013-03-12 02:37:28 +04:00
|
|
|
collapse, keep, keepbranches, external, activebookmark)
|
2008-08-18 23:16:31 +04:00
|
|
|
except IOError, err:
|
|
|
|
if err.errno != errno.ENOENT:
|
|
|
|
raise
|
|
|
|
raise util.Abort(_('no rebase in progress'))
|
|
|
|
|
2013-08-02 02:33:09 +04:00
|
|
|
def inrebase(repo, originalwd, state):
|
2013-10-23 21:49:56 +04:00
|
|
|
'''check whether the working dir is in an interrupted rebase'''
|
2013-08-02 02:33:09 +04:00
|
|
|
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
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
def abort(repo, originalwd, target, state):
|
|
|
|
'Restore the repository to its original state'
|
2014-12-04 18:03:02 +03:00
|
|
|
dstates = [s for s in state.values() if s >= 0]
|
2012-06-18 13:16:24 +04:00
|
|
|
immutable = [d for d in dstates if not repo[d].mutable()]
|
2013-08-02 02:54:12 +04:00
|
|
|
cleanup = True
|
2012-06-18 13:16:24 +04:00
|
|
|
if immutable:
|
2013-08-02 02:45:13 +04:00
|
|
|
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'))
|
2013-08-02 02:54:12 +04:00
|
|
|
cleanup = False
|
2012-03-23 02:47:00 +04:00
|
|
|
|
|
|
|
descendants = set()
|
|
|
|
if dstates:
|
2012-06-01 23:45:16 +04:00
|
|
|
descendants = set(repo.changelog.descendants(dstates))
|
2012-03-23 02:47:00 +04:00
|
|
|
if descendants - set(dstates):
|
2008-08-18 23:16:31 +04:00
|
|
|
repo.ui.warn(_("warning: new changesets detected on target branch, "
|
2013-08-02 02:54:12 +04:00
|
|
|
"can't strip\n"))
|
|
|
|
cleanup = False
|
|
|
|
|
|
|
|
if cleanup:
|
2013-08-02 02:33:09 +04:00
|
|
|
# Update away from the rebase if necessary
|
2013-08-02 02:54:12 +04:00
|
|
|
if inrebase(repo, originalwd, state):
|
2014-12-02 07:12:59 +03:00
|
|
|
merge.update(repo, originalwd, False, True, False)
|
2013-08-02 02:33:09 +04:00
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
# Strip from the first rebased revision
|
2014-12-04 18:03:02 +03:00
|
|
|
rebased = filter(lambda x: x >= 0 and x != target, state.values())
|
2013-08-02 02:54:12 +04:00
|
|
|
if rebased:
|
2013-01-17 03:35:01 +04:00
|
|
|
strippoints = [c.node() for c in repo.set('roots(%ld)', rebased)]
|
2010-05-20 21:21:35 +04:00
|
|
|
# no backup of rebased cset versions needed
|
2013-01-17 03:35:01 +04:00
|
|
|
repair.strip(repo.ui, repo, strippoints)
|
2013-08-02 02:54:12 +04:00
|
|
|
|
|
|
|
clearstatus(repo)
|
|
|
|
repo.ui.warn(_('rebase aborted\n'))
|
|
|
|
return 0
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2012-06-20 22:08:57 +04:00
|
|
|
def buildstate(repo, dest, rebaseset, collapse):
|
2011-10-15 21:07:51 +04:00
|
|
|
'''Define which revisions are going to be rebased and where
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2011-10-15 21:07:51 +04:00
|
|
|
repo: repo
|
|
|
|
dest: context
|
|
|
|
rebaseset: set of rev
|
2012-06-20 22:08:57 +04:00
|
|
|
'''
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2010-03-02 23:08:43 +03:00
|
|
|
# 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.
|
2011-10-15 21:07:51 +04:00
|
|
|
if 'qtip' in repo.tags() and (dest.node() in
|
2010-03-14 02:36:10 +03:00
|
|
|
[s.node for s in repo.mq.applied]):
|
2010-03-02 23:08:43 +03:00
|
|
|
raise util.Abort(_('cannot rebase onto an applied mq patch'))
|
|
|
|
|
2011-10-15 21:07:51 +04:00
|
|
|
roots = list(repo.set('roots(%ld)', rebaseset))
|
|
|
|
if not roots:
|
2011-10-15 22:12:32 +04:00
|
|
|
raise util.Abort(_('no matching revisions'))
|
2013-01-17 03:35:01 +04:00
|
|
|
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
|
|
|
|
|
2014-02-15 04:23:12 +04:00
|
|
|
repo.ui.debug('rebase onto %d starting from %s\n' % (dest, root))
|
2014-12-02 20:46:20 +03:00
|
|
|
state.update(dict.fromkeys(rebaseset, revtodo))
|
2013-01-17 03:35:01 +04:00
|
|
|
# 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
|
2013-01-19 02:41:48 +04:00
|
|
|
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
|
2013-02-10 21:24:29 +04:00
|
|
|
# the revision should be ignored but that `defineparents` should search
|
|
|
|
# a rebase destination that make sense regarding rebased topology.
|
2013-01-19 02:41:48 +04:00
|
|
|
rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset))
|
|
|
|
for ignored in set(rebasedomain) - set(rebaseset):
|
|
|
|
state[ignored] = revignored
|
2011-10-15 21:07:51 +04:00
|
|
|
return repo['.'].rev(), dest.rev(), state
|
2008-08-18 23:16:31 +04:00
|
|
|
|
rebase: do not invent successor to skipped changeset
When rebase results in an empty a changeset it is "skipped" and no related
changeset is created at all. When we added obsolescence support to rebase (in
cee0a253a56c) it seemed a good idea to use its parent successor as the
successors for such dropped changesets. (see old version of the altered test).
This option was chosen because it seems a good way to hint about were the
dropped changeset "intended" to be. Such hint would have been used by automatic
evolution mechanism to rebase potential unstable children.
However, field testing of this version are not conclusive. It very often leads
to the creation of (totally unfounded) evolution divergence. This changeset
changes this behavior and mark skipped changesets as pruned (obsolete without
successors). This prevents the issue and seems semantically better probably a
win for obsolescence reading tool.
See example bellow for details:
User Babar has five changesets of interest:
- O, its current base of development.
- U, the new upstream
- A and C, some development changesets
- B another development changeset independent from A
O - A - B - C
\
U
Babar decides that B is more critical than the A and C and rebase it first
$ hg rebase --rev B --dest U
B is now obsolete (in lower case bellow). Rebase result, B', is its
successors.(note, C is unstable)
O - A - b - C
\
U - B'
Babar is now done with B', and want to rebase the rest of its history:
$ hg rebase --source A --dest B'
hg rebase process A, B and C. B is skipped as all its changes are already contained
in B'.
O - U - B' - A' - C'
Babar have the expected result graph wise, obsolescence marker are as follow:
B -> B' (from first rebase)
A -> A' (from second rebase)
C -> C' (from second rebase)
B -> ?? (from second rebase)
Before this changeset, the last marker is `B -> A'`. This cause two issues:
- This is semantically wrong. B have nothing to do with A'
- B has now two successors sets: (B',) and (A',). We detect a divergent
rewriting. The B' and A' are reported as "divergent" to Babar, confusion
ensues. In addition such divergent situation (divergent changeset are children
to each other) is tricky to solve.
With this changeset the last marker is `B -> ø`:
- This is semantically better.
- B has a single successors set (B',)
This scenario is added to the tests suite.
2013-01-18 17:15:32 +04:00
|
|
|
def clearrebased(ui, repo, state, skipped, collapsedas=None):
|
2012-09-19 01:42:27 +04:00
|
|
|
"""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."""
|
2014-10-15 00:23:52 +04:00
|
|
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
2012-09-19 01:13:31 +04:00
|
|
|
markers = []
|
|
|
|
for rev, newrev in sorted(state.items()):
|
|
|
|
if newrev >= 0:
|
rebase: do not invent successor to skipped changeset
When rebase results in an empty a changeset it is "skipped" and no related
changeset is created at all. When we added obsolescence support to rebase (in
cee0a253a56c) it seemed a good idea to use its parent successor as the
successors for such dropped changesets. (see old version of the altered test).
This option was chosen because it seems a good way to hint about were the
dropped changeset "intended" to be. Such hint would have been used by automatic
evolution mechanism to rebase potential unstable children.
However, field testing of this version are not conclusive. It very often leads
to the creation of (totally unfounded) evolution divergence. This changeset
changes this behavior and mark skipped changesets as pruned (obsolete without
successors). This prevents the issue and seems semantically better probably a
win for obsolescence reading tool.
See example bellow for details:
User Babar has five changesets of interest:
- O, its current base of development.
- U, the new upstream
- A and C, some development changesets
- B another development changeset independent from A
O - A - B - C
\
U
Babar decides that B is more critical than the A and C and rebase it first
$ hg rebase --rev B --dest U
B is now obsolete (in lower case bellow). Rebase result, B', is its
successors.(note, C is unstable)
O - A - b - C
\
U - B'
Babar is now done with B', and want to rebase the rest of its history:
$ hg rebase --source A --dest B'
hg rebase process A, B and C. B is skipped as all its changes are already contained
in B'.
O - U - B' - A' - C'
Babar have the expected result graph wise, obsolescence marker are as follow:
B -> B' (from first rebase)
A -> A' (from second rebase)
C -> C' (from second rebase)
B -> ?? (from second rebase)
Before this changeset, the last marker is `B -> A'`. This cause two issues:
- This is semantically wrong. B have nothing to do with A'
- B has now two successors sets: (B',) and (A',). We detect a divergent
rewriting. The B' and A' are reported as "divergent" to Babar, confusion
ensues. In addition such divergent situation (divergent changeset are children
to each other) is tricky to solve.
With this changeset the last marker is `B -> ø`:
- This is semantically better.
- B has a single successors set (B',)
This scenario is added to the tests suite.
2013-01-18 17:15:32 +04:00
|
|
|
if rev in skipped:
|
|
|
|
succs = ()
|
|
|
|
elif collapsedas is not None:
|
|
|
|
succs = (repo[collapsedas],)
|
|
|
|
else:
|
|
|
|
succs = (repo[newrev],)
|
|
|
|
markers.append((repo[rev], succs))
|
2012-09-19 01:13:31 +04:00
|
|
|
if markers:
|
|
|
|
obsolete.createmarkers(repo, markers)
|
|
|
|
else:
|
2013-01-19 02:21:32 +04:00
|
|
|
rebased = [rev for rev in state if state[rev] > nullmerge]
|
2012-09-19 01:13:31 +04:00
|
|
|
if rebased:
|
2013-01-17 03:35:01 +04:00
|
|
|
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:
|
2012-09-19 01:13:31 +04:00
|
|
|
# backup the old csets by default
|
2013-01-17 03:35:01 +04:00
|
|
|
repair.strip(ui, repo, stripped, "all")
|
2012-09-19 00:58:12 +04:00
|
|
|
|
|
|
|
|
2008-10-23 02:34:52 +04:00
|
|
|
def pullrebase(orig, ui, repo, *args, **opts):
|
2008-08-18 23:16:31 +04:00
|
|
|
'Call rebase after pull if the latter has been invoked with --rebase'
|
|
|
|
if opts.get('rebase'):
|
|
|
|
if opts.get('update'):
|
2009-04-29 13:39:49 +04:00
|
|
|
del opts['update']
|
2009-09-19 03:15:38 +04:00
|
|
|
ui.debug('--update and --rebase are not compatible, ignoring '
|
|
|
|
'the update flag\n')
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2012-03-05 03:12:12 +04:00
|
|
|
movemarkfrom = repo['.'].node()
|
2008-08-18 23:16:31 +04:00
|
|
|
revsprepull = len(repo)
|
2010-03-10 14:38:33 +03:00
|
|
|
origpostincoming = commands.postincoming
|
|
|
|
def _dummy(*args, **kwargs):
|
|
|
|
pass
|
|
|
|
commands.postincoming = _dummy
|
|
|
|
try:
|
|
|
|
orig(ui, repo, *args, **opts)
|
|
|
|
finally:
|
|
|
|
commands.postincoming = origpostincoming
|
2008-08-18 23:16:31 +04:00
|
|
|
revspostpull = len(repo)
|
|
|
|
if revspostpull > revsprepull:
|
2012-11-29 19:37:15 +04:00
|
|
|
# --rev option from pull conflict with rebase own --rev
|
|
|
|
# dropping it
|
|
|
|
if 'rev' in opts:
|
|
|
|
del opts['rev']
|
2008-10-23 02:34:52 +04:00
|
|
|
rebase(ui, repo, **opts)
|
2009-01-18 21:59:51 +03:00
|
|
|
branch = repo[None].branch()
|
|
|
|
dest = repo[branch].rev()
|
|
|
|
if dest != repo['.'].rev():
|
|
|
|
# there was nothing to rebase we force an update
|
2010-03-10 14:38:33 +03:00
|
|
|
hg.update(repo, dest)
|
2012-03-05 03:12:12 +04:00
|
|
|
if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
|
|
|
|
ui.status(_("updating bookmark %s\n")
|
|
|
|
% repo._bookmarkcurrent)
|
2008-08-18 23:16:31 +04:00
|
|
|
else:
|
2011-05-27 12:03:29 +04:00
|
|
|
if opts.get('tool'):
|
|
|
|
raise util.Abort(_('--tool can only be used with --rebase'))
|
2008-10-23 02:34:52 +04:00
|
|
|
orig(ui, repo, *args, **opts)
|
2008-08-18 23:16:31 +04:00
|
|
|
|
2013-05-14 22:23:17 +04:00
|
|
|
def summaryhook(ui, repo):
|
|
|
|
if not os.path.exists(repo.join('rebasestate')):
|
|
|
|
return
|
2013-09-30 19:35:07 +04:00
|
|
|
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
|
2014-12-04 18:03:02 +03:00
|
|
|
numrebased = len([i for i in state.itervalues() if i >= 0])
|
2013-05-14 22:23:17 +04:00
|
|
|
# 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)))
|
|
|
|
|
2008-08-18 23:16:31 +04:00
|
|
|
def uisetup(ui):
|
|
|
|
'Replace pull with a decorator to provide --rebase option'
|
2008-10-23 02:34:52 +04:00
|
|
|
entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
|
|
|
|
entry[1].append(('', 'rebase', None,
|
2011-05-27 12:03:29 +04:00
|
|
|
_("rebase working directory to branch head")))
|
|
|
|
entry[1].append(('t', 'tool', '',
|
|
|
|
_("specify merge tool for rebase")))
|
2013-05-14 22:23:17 +04:00
|
|
|
cmdutil.summaryhooks.add('rebase', summaryhook)
|
2013-07-25 08:51:44 +04:00
|
|
|
cmdutil.unfinishedstates.append(
|
2013-07-25 11:17:52 +04:00
|
|
|
['rebasestate', False, False, _('rebase in progress'),
|
2013-07-25 08:51:44 +04:00
|
|
|
_("use 'hg rebase --continue' or 'hg rebase --abort'")])
|