mercurial-scm/hg: hgext/rebase.py annotate

annotate hgext/rebase.py @ 34005:5e83a8fe6bc4

rebase: initial support for multiple destinations This patch defines `SRC` (a single source revision) and `ALLSRC` (all source revisions) to be valid names in `--dest` revset if `--src` or `--rev` is used. So destination could be defined differently according to source revisions. The names are capitalized to make it clear they are "dynamically defined", distinguishable from normal revsets (Thanks Augie for the suggestion). This is useful, for example, `-r 'orphan()' -d 'calc-dest(SRC)'` to solve instability, which seems to be a highly wanted feature. The feature is not completed, namely if `-d` overlaps with `-r`, things could go wrong. A later patch will handle that case. The feature is also gated by `experimental.rebase.multidest` config option which is default off. Differential Revision: https://phab.mercurial-scm.org/D469

author	Jun Wu <quark@fb.com>
date	Tue, 29 Aug 2017 17:27:37 -0700
parents	af609bb3487f
children	32528419db64

rev	line source
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1 # rebase.py - rebasing feature for mercurial
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	2 #
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	3 # Copyright 2008 Stefano Tortarolo <stefano.tortarolo at gmail dot com>
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8222 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9815 diff changeset	6 # GNU General Public License version 2 or any later version.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	7
8934 9dda4c73fc3b extensions: change descriptions for extensions providing a few commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8706 diff changeset	8 '''command to move sets of revisions to a different ancestor
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	9
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7955 diff changeset	10 This extension lets you rebase changesets in an existing Mercurial
b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7955 diff changeset	11 repository.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	12
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	13 For more information:
26421 4b0fc75f9403 urls: bulk-change primary website URLs Matt Mackall <mpm@selenic.com> parents: 26360 diff changeset	14 https://mercurial-scm.org/wiki/RebaseExtension
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	15 '''
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	16
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	17 from __future__ import absolute_import
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	18
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	19 import errno
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	20 import os
29205 a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	21
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	22 from mercurial.i18n import _
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	23 from mercurial.node import (
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	24 nullid,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	25 nullrev,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	26 short,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	27 )
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	28 from mercurial import (
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	29 bookmarks,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	30 cmdutil,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	31 commands,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	32 copies,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	33 destutil,
30490 ee2097c560c1 rebase: refer to dirstateguard by its new name Augie Fackler <augie@google.com> parents: 30459 diff changeset	34 dirstateguard,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	35 error,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	36 extensions,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	37 hg,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	38 lock,
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	39 merge as mergemod,
30495 d528ddc11b33 rebase: refer to checkunresolved by its new name Augie Fackler <augie@google.com> parents: 30490 diff changeset	40 mergeutil,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	41 obsolete,
33145 0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33139 diff changeset	42 obsutil,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	43 patch,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	44 phases,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	45 registrar,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	46 repair,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	47 repoview,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	48 revset,
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	49 revsetlang,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	50 scmutil,
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30865 diff changeset	51 smartset,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	52 util,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	53 )
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	54
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	55 release = lock.release
32375 04baab18d60a commands: move templates of common command options to cmdutil (API) Yuya Nishihara <yuya@tcha.org> parents: 32348 diff changeset	56 templateopts = cmdutil.templateopts
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	57
26669 07db7e95c464 rebase: added comments Christian Delahousse <cdelahousse@fb.com> parents: 26587 diff changeset	58 # The following constants are used throughout the rebase module. The ordering of
07db7e95c464 rebase: added comments Christian Delahousse <cdelahousse@fb.com> parents: 26587 diff changeset	59 # their values must be maintained.
07db7e95c464 rebase: added comments Christian Delahousse <cdelahousse@fb.com> parents: 26587 diff changeset	60
07db7e95c464 rebase: added comments Christian Delahousse <cdelahousse@fb.com> parents: 26587 diff changeset	61 # Indicates that a revision needs to be rebased
23490 102f144f6e02 rebase: add a 'revtodo' constant Pierre-Yves David <pierre-yves.david@fb.com> parents: 23489 diff changeset	62 revtodo = -1
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	63 revtodostr = '-1'
33843 d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	64
d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	65 # legacy revstates no longer needed in current code
33845 3ddbab49efcf rebase: remove revignored and nullmerge states Jun Wu <quark@fb.com> parents: 33844 diff changeset	66 # -2: nullmerge, -3: revignored, -4: revprecursor, -5: revpruned
3ddbab49efcf rebase: remove revignored and nullmerge states Jun Wu <quark@fb.com> parents: 33844 diff changeset	67 legacystates = {'-2', '-3', '-4', '-5'}
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10351 diff changeset	68
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	69 cmdtable = {}
32337 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 32327 diff changeset	70 command = registrar.command(cmdtable)
29841 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29610 diff changeset	71 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
25186 80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25102 diff changeset	72 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25102 diff changeset	73 # be specifying the version(s) of Mercurial they are tested with, or
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25102 diff changeset	74 # leave the attribute unspecified.
29841 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29610 diff changeset	75 testedwith = 'ships-with-hg-core'
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	76
26671 66dc39cd7d06 rebase: factor out nothing to rebase return code Ryan McElroy <rmcelroy@fb.com> parents: 26669 diff changeset	77 def _nothingtorebase():
66dc39cd7d06 rebase: factor out nothing to rebase return code Ryan McElroy <rmcelroy@fb.com> parents: 26669 diff changeset	78 return 1
66dc39cd7d06 rebase: factor out nothing to rebase return code Ryan McElroy <rmcelroy@fb.com> parents: 26669 diff changeset	79
27976 8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	80 def _savegraft(ctx, extra):
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	81 s = ctx.extra().get('source', None)
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	82 if s is not None:
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	83 extra['source'] = s
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	84 s = ctx.extra().get('intermediate-source', None)
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	85 if s is not None:
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	86 extra['intermediate-source'] = s
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	87
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	88 def _savebranch(ctx, extra):
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	89 extra['branch'] = ctx.branch()
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	90
19860 6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	91 def _makeextrafn(copiers):
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	92 """make an extrafn out of the given copy-functions.
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	93
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	94 A copy function takes a context and an extra dict, and mutates the
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	95 extra dict as needed based on the given context.
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	96 """
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	97 def extrafn(ctx, extra):
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	98 for c in copiers:
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	99 c(ctx, extra)
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	100 return extrafn
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	101
29043 cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	102 def _destrebase(repo, sourceset, destspace=None):
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	103 """small wrapper around destmerge to pass the right extra args
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	104
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	105 Please wrap destutil.destmerge instead."""
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	106 return destutil.destmerge(repo, action='rebase', sourceset=sourceset,
29043 cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	107 onheadcheck=False, destspace=destspace)
26717 1755e1d9d1c3 rebase: extra default destination in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26677 diff changeset	108
28394 dcb4209bd30d revset: replace extpredicate by revsetpredicate of registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28280 diff changeset	109 revsetpredicate = registrar.revsetpredicate()
27586 42910f9fffeb revset: use delayregistrar to register predicate in extension easily FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27577 diff changeset	110
42910f9fffeb revset: use delayregistrar to register predicate in extension easily FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27577 diff changeset	111 @revsetpredicate('_destrebase')
26719 8bed1eae99df rebase: rename and test '_destrebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26718 diff changeset	112 def _revsetdestrebase(repo, subset, x):
26301 3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	113 # ``_rebasedefaultdest()``
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	114
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	115 # default destination for rebase.
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	116 # # XXX: Currently private because I expect the signature to change.
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	117 # # XXX: - bailing out in case of ambiguity vs returning all data.
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	118 # i18n: "_rebasedefaultdest" is a keyword
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	119 sourceset = None
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	120 if x is not None:
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30865 diff changeset	121 sourceset = revset.getset(repo, smartset.fullreposet(repo), x)
aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30865 diff changeset	122 return subset & smartset.baseset([_destrebase(repo, sourceset)])
26301 3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	123
33841 35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	124 def _ctxdesc(ctx):
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	125 """short description for a context"""
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	126 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	127 ctx.description().split('\n', 1)[0])
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	128 repo = ctx.repo()
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	129 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	130 if names:
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	131 desc += ' (%s)' % ' '.join(names)
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	132 return desc
35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	133
29358 6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	134 class rebaseruntime(object):
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	135 """This class is a container for rebase runtime state"""
29399 adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	136 def __init__(self, repo, ui, opts=None):
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	137 if opts is None:
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	138 opts = {}
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	139
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	140 self.repo = repo
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	141 self.ui = ui
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	142 self.opts = opts
29358 6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	143 self.originalwd = None
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	144 self.external = nullrev
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	145 # Mapping between the old revision id and either what is the new rebased
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	146 # revision or what needs to be done with the old revision. The state
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	147 # dict will be what contains most of the rebase progress state.
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	148 self.state = {}
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	149 self.activebookmark = None
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	150 self.destmap = {}
29360 4cbe62ab5c97 rebase: move local variable 'skipped' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29359 diff changeset	151 self.skipped = set()
29358 6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	152
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	153 self.collapsef = opts.get('collapse', False)
c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	154 self.collapsemsg = cmdutil.logmessage(ui, opts)
29401 87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	155 self.date = opts.get('date', None)
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	156
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	157 e = opts.get('extrafn') # internal, used by e.g. hgsubversion
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	158 self.extrafns = [_savegraft]
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	159 if e:
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	160 self.extrafns = [e]
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	161
29402 7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	162 self.keepf = opts.get('keep', False)
7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	163 self.keepbranchesf = opts.get('keepbranches', False)
7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	164 # keepopen is not meant for use on the command line, but by
7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	165 # other extensions
7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	166 self.keepopen = opts.get('keepopen', False)
29404 591a8069b60e rebase: move local variable 'obsoletenotrebased' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29403 diff changeset	167 self.obsoletenotrebased = {}
29402 7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	168
31224 183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	169 def storestatus(self, tr=None):
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	170 """Store the current status to allow recovery"""
31224 183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	171 if tr:
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	172 tr.addfilegenerator('rebasestate', ('rebasestate',),
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	173 self._writestatus, location='plain')
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	174 else:
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	175 with self.repo.vfs("rebasestate", "w") as f:
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	176 self._writestatus(f)
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	177
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	178 def _writestatus(self, f):
31619 91ddb33deea5 rebase: move state serialization to use unfiltered repo Durham Goode <durham@fb.com> parents: 31588 diff changeset	179 repo = self.repo.unfiltered()
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	180 f.write(repo[self.originalwd].hex() + '\n')
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	181 # was "dest". we now write dest per src root below.
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	182 f.write('\n')
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	183 f.write(repo[self.external].hex() + '\n')
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	184 f.write('%d\n' % int(self.collapsef))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	185 f.write('%d\n' % int(self.keepf))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	186 f.write('%d\n' % int(self.keepbranchesf))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	187 f.write('%s\n' % (self.activebookmark or ''))
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	188 destmap = self.destmap
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	189 for d, v in self.state.iteritems():
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	190 oldrev = repo[d].hex()
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	191 if v >= 0:
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	192 newrev = repo[v].hex()
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	193 else:
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	194 newrev = v
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	195 destnode = repo[destmap[d]].hex()
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	196 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode))
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	197 repo.ui.debug('rebase status stored\n')
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	198
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	199 def restorestatus(self):
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	200 """Restore a previously stored status"""
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	201 repo = self.repo
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	202 keepbranches = None
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	203 legacydest = None
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	204 collapse = False
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	205 external = nullrev
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	206 activebookmark = None
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	207 state = {}
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	208 destmap = {}
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	209
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	210 try:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	211 f = repo.vfs("rebasestate")
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	212 for i, l in enumerate(f.read().splitlines()):
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	213 if i == 0:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	214 originalwd = repo[l].rev()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	215 elif i == 1:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	216 # this line should be empty in newer version. but legacy
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	217 # clients may still use it
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	218 if l:
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	219 legacydest = repo[l].rev()
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	220 elif i == 2:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	221 external = repo[l].rev()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	222 elif i == 3:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	223 collapse = bool(int(l))
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	224 elif i == 4:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	225 keep = bool(int(l))
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	226 elif i == 5:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	227 keepbranches = bool(int(l))
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	228 elif i == 6 and not (len(l) == 81 and ':' in l):
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	229 # line 6 is a recent addition, so for backwards
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	230 # compatibility check that the line doesn't look like the
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	231 # oldrev:newrev lines
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	232 activebookmark = l
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	233 else:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	234 args = l.split(':')
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	235 oldrev = args[0]
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	236 newrev = args[1]
33843 d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	237 if newrev in legacystates:
d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	238 continue
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	239 if len(args) > 2:
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	240 destnode = args[2]
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	241 else:
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	242 destnode = legacydest
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	243 destmap[repo[oldrev].rev()] = repo[destnode].rev()
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	244 if newrev in (nullid, revtodostr):
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	245 state[repo[oldrev].rev()] = revtodo
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	246 # Legacy compat special case
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	247 else:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	248 state[repo[oldrev].rev()] = repo[newrev].rev()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	249
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	250 except IOError as err:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	251 if err.errno != errno.ENOENT:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	252 raise
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	253 cmdutil.wrongtooltocontinue(repo, _('rebase'))
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	254
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	255 if keepbranches is None:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	256 raise error.Abort(_('.hg/rebasestate is incomplete'))
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	257
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	258 skipped = set()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	259 # recompute the set of skipped revs
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	260 if not collapse:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	261 seen = set(destmap.values())
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	262 for old, new in sorted(state.items()):
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	263 if new != revtodo and new in seen:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	264 skipped.add(old)
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	265 seen.add(new)
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	266 repo.ui.debug('computed skipped revs: %s\n' %
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	267 (' '.join(str(r) for r in sorted(skipped)) or None))
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	268 repo.ui.debug('rebase status resumed\n')
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32272 diff changeset	269 _setrebasesetvisibility(repo, set(state.keys()) \| {originalwd})
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	270
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	271 self.originalwd = originalwd
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	272 self.destmap = destmap
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	273 self.state = state
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	274 self.skipped = skipped
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	275 self.collapsef = collapse
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	276 self.keepf = keep
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	277 self.keepbranchesf = keepbranches
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	278 self.external = external
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	279 self.activebookmark = activebookmark
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	280
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	281 def _handleskippingobsolete(self, obsoleterevs, destmap):
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	282 """Compute structures necessary for skipping obsolete revisions
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	283
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	284 obsoleterevs: iterable of all obsolete revisions in rebaseset
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	285 destmap: {srcrev: destrev} destination revisions
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	286 """
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	287 self.obsoletenotrebased = {}
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	288 if not self.ui.configbool('experimental', 'rebaseskipobsolete',
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	289 default=True):
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	290 return
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	291 obsoleteset = set(obsoleterevs)
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	292 self.obsoletenotrebased = _computeobsoletenotrebased(self.repo,
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	293 obsoleteset, destmap)
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	294 skippedset = set(self.obsoletenotrebased)
33846 3b04a6ff625c rebase: remove rebaseset from _checkobsrebase Jun Wu <quark@fb.com> parents: 33845 diff changeset	295 _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	296
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	297 def _prepareabortorcontinue(self, isabort):
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	298 try:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	299 self.restorestatus()
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	300 self.collapsemsg = restorecollapsemsg(self.repo, isabort)
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	301 except error.RepoLookupError:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	302 if isabort:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	303 clearstatus(self.repo)
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	304 clearcollapsemsg(self.repo)
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	305 self.repo.ui.warn(_('rebase aborted (no revision is removed,'
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	306 ' only broken state is cleared)\n'))
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	307 return 0
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	308 else:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	309 msg = _('cannot continue inconsistent rebase')
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	310 hint = _('use "hg rebase --abort" to clear broken state')
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	311 raise error.Abort(msg, hint=hint)
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	312 if isabort:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	313 return abort(self.repo, self.originalwd, self.destmap,
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	314 self.state, activebookmark=self.activebookmark)
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	315
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	316 def _preparenewrebase(self, destmap):
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	317 if not destmap:
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	318 return _nothingtorebase()
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	319
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	320 rebaseset = destmap.keys()
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	321 allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt)
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	322 if (not (self.keepf or allowunstable)
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	323 and self.repo.revs('first(children(%ld) - %ld)',
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	324 rebaseset, rebaseset)):
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	325 raise error.Abort(
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	326 _("can't remove original changesets with"
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	327 " unrebased descendants"),
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	328 hint=_('use --keep to keep original changesets'))
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	329
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	330 obsrevs = _filterobsoleterevs(self.repo, rebaseset)
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	331 self._handleskippingobsolete(obsrevs, destmap)
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	332
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	333 result = buildstate(self.repo, destmap, self.collapsef,
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	334 self.obsoletenotrebased)
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	335
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	336 if not result:
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	337 # Empty state built, nothing to rebase
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	338 self.ui.status(_('nothing to rebase\n'))
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	339 return _nothingtorebase()
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	340
31302 681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	341 for root in self.repo.set('roots(%ld)', rebaseset):
681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	342 if not self.keepf and not root.mutable():
681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	343 raise error.Abort(_("can't rebase public changeset %s")
681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	344 % root,
681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	345 hint=_("see 'hg help phases' for details"))
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	346
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	347 (self.originalwd, self.destmap, self.state) = result
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	348 if self.collapsef:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	349 dests = set(self.destmap.values())
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	350 if len(dests) != 1:
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	351 raise error.Abort(
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	352 _('--collapse does not work with multiple destinations'))
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	353 destrev = next(iter(dests))
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	354 destancestors = self.repo.changelog.ancestors([destrev],
33847 ddf77c0cc169 rebase: remove self.destancestors Jun Wu <quark@fb.com> parents: 33846 diff changeset	355 inclusive=True)
ddf77c0cc169 rebase: remove self.destancestors Jun Wu <quark@fb.com> parents: 33846 diff changeset	356 self.external = externalparent(self.repo, self.state, destancestors)
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	357
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	358 for destrev in sorted(set(destmap.values())):
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	359 dest = self.repo[destrev]
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	360 if dest.closesbranch() and not self.keepbranchesf:
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	361 self.ui.status(_('reopening closed branch head %s\n') % dest)
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	362
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	363 def _performrebase(self, tr):
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	364 repo, ui, opts = self.repo, self.ui, self.opts
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	365 if self.keepbranchesf:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	366 # insert _savebranch at the start of extrafns so if
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	367 # there's a user-provided extrafn it can clobber branch if
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	368 # desired
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	369 self.extrafns.insert(0, _savebranch)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	370 if self.collapsef:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	371 branches = set()
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	372 for rev in self.state:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	373 branches.add(repo[rev].branch())
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	374 if len(branches) > 1:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	375 raise error.Abort(_('cannot collapse multiple named '
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	376 'branches'))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	377
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	378 # Keep track of the active bookmarks in order to reset them later
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	379 self.activebookmark = self.activebookmark or repo._activebookmark
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	380 if self.activebookmark:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	381 bookmarks.deactivate(repo)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	382
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	383 # Store the state before we begin so users can run 'hg rebase --abort'
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	384 # if we fail before the transaction closes.
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	385 self.storestatus()
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	386
30007 aca0954d3739 rebase: rebase changesets in topo order (issue5370) (BC) Xidorn Quan <me@upsuper.org> parents: 29966 diff changeset	387 sortedrevs = repo.revs('sort(%ld, -topo)', self.state)
29872 58db005d870e rebase: properly calculate total commits to rebase (issue5347) timeless <timeless@mozdev.org> parents: 29841 diff changeset	388 cands = [k for k, v in self.state.iteritems() if v == revtodo]
58db005d870e rebase: properly calculate total commits to rebase (issue5347) timeless <timeless@mozdev.org> parents: 29841 diff changeset	389 total = len(cands)
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	390 pos = 0
29552 db26925bdbb0 rebase: remove sortedstate-related confusion Kostia Balytskyi <ikostia@fb.com> parents: 29551 diff changeset	391 for rev in sortedrevs:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	392 dest = self.destmap[rev]
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	393 ctx = repo[rev]
33841 35fc5e919675 rebase: extract ctx description logic to a function Jun Wu <quark@fb.com> parents: 33789 diff changeset	394 desc = _ctxdesc(ctx)
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	395 if self.state[rev] == rev:
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	396 ui.status(_('already rebased %s\n') % desc)
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	397 elif self.state[rev] == revtodo:
29872 58db005d870e rebase: properly calculate total commits to rebase (issue5347) timeless <timeless@mozdev.org> parents: 29841 diff changeset	398 pos += 1
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	399 ui.status(_('rebasing %s\n') % desc)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	400 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	401 _('changesets'), total)
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	402 p1, p2, base = defineparents(repo, rev, self.destmap,
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	403 self.state)
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	404 self.storestatus(tr=tr)
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	405 storecollapsemsg(repo, self.collapsemsg)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	406 if len(repo[None].parents()) == 2:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	407 repo.ui.debug('resuming interrupted rebase\n')
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	408 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	409 try:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	410 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	411 'rebase')
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	412 stats = rebasenode(repo, rev, p1, base, self.state,
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	413 self.collapsef, dest)
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	414 if stats and stats[3] > 0:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	415 raise error.InterventionRequired(
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	416 _('unresolved conflicts (see hg '
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	417 'resolve, then hg rebase --continue)'))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	418 finally:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	419 ui.setconfig('ui', 'forcemerge', '', 'rebase')
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	420 if not self.collapsef:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	421 merging = p2 != nullrev
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	422 editform = cmdutil.mergeeditform(merging, 'rebase')
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	423 editor = cmdutil.getcommiteditor(editform=editform, **opts)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	424 newnode = concludenode(repo, rev, p1, p2,
29551 333dd3ab8fb2 rebase: replace extrafn field with _makeextrafn invocations Kostia Balytskyi <ikostia@fb.com> parents: 29479 diff changeset	425 extrafn=_makeextrafn(self.extrafns),
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	426 editor=editor,
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	427 keepbranches=self.keepbranchesf,
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	428 date=self.date)
32313 a580b2d65ded rebase: make sure merge state is cleaned up for no-op rebases (issue5494) Jeremy Fitzhardinge <jsgf@fb.com> parents: 32291 diff changeset	429 if newnode is None:
a580b2d65ded rebase: make sure merge state is cleaned up for no-op rebases (issue5494) Jeremy Fitzhardinge <jsgf@fb.com> parents: 32291 diff changeset	430 # If it ended up being a no-op commit, then the normal
a580b2d65ded rebase: make sure merge state is cleaned up for no-op rebases (issue5494) Jeremy Fitzhardinge <jsgf@fb.com> parents: 32291 diff changeset	431 # merge state clean-up path doesn't happen, so do it
a580b2d65ded rebase: make sure merge state is cleaned up for no-op rebases (issue5494) Jeremy Fitzhardinge <jsgf@fb.com> parents: 32291 diff changeset	432 # here. Fix issue5494
a580b2d65ded rebase: make sure merge state is cleaned up for no-op rebases (issue5494) Jeremy Fitzhardinge <jsgf@fb.com> parents: 32291 diff changeset	433 mergemod.mergestate.clean(repo)
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	434 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	435 # Skip commit if we are collapsing
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	436 repo.setparents(repo[p1].node())
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	437 newnode = None
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	438 # Update the state
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	439 if newnode is not None:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	440 self.state[rev] = repo[newnode].rev()
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	441 ui.debug('rebased as %s\n' % short(newnode))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	442 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	443 if not self.collapsef:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	444 ui.warn(_('note: rebase of %d:%s created no changes '
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	445 'to commit\n') % (rev, ctx))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	446 self.skipped.add(rev)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	447 self.state[rev] = p1
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	448 ui.debug('next revision set to %s\n' % p1)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	449 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	450 ui.status(_('already rebased %s as %s\n') %
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	451 (desc, repo[self.state[rev]]))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	452
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	453 ui.progress(_('rebasing'), None)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	454 ui.note(_('rebase merging completed\n'))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	455
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	456 def _finishrebase(self):
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	457 repo, ui, opts = self.repo, self.ui, self.opts
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	458 if self.collapsef and not self.keepopen:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	459 p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	460 self.state)
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	461 editopt = opts.get('edit')
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	462 editform = 'rebase.collapse'
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	463 if self.collapsemsg:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	464 commitmsg = self.collapsemsg
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	465 else:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	466 commitmsg = 'Collapsed revision'
33622 5a5f600b06ad rebase: sort collapsed revisions in commit message (issue5643) Yuya Nishihara <yuya@tcha.org> parents: 33590 diff changeset	467 for rebased in sorted(self.state):
33848 bc9e075133c9 rebase: remove "state >= revtodo" condition Jun Wu <quark@fb.com> parents: 33847 diff changeset	468 if rebased not in self.skipped:
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	469 commitmsg += '\n* %s' % repo[rebased].description()
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	470 editopt = True
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	471 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
29552 db26925bdbb0 rebase: remove sortedstate-related confusion Kostia Balytskyi <ikostia@fb.com> parents: 29551 diff changeset	472 revtoreuse = max(self.state)
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	473
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	474 dsguard = None
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	475 if ui.configbool('rebase', 'singletransaction'):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	476 dsguard = dirstateguard.dirstateguard(repo, 'rebase')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	477 with util.acceptintervention(dsguard):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	478 newnode = concludenode(repo, revtoreuse, p1, self.external,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	479 commitmsg=commitmsg,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	480 extrafn=_makeextrafn(self.extrafns),
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	481 editor=editor,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	482 keepbranches=self.keepbranchesf,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	483 date=self.date)
33864 70354bd4f19b rebase: only change self.state when collapsing in _finishrebase Jun Wu <quark@fb.com> parents: 33863 diff changeset	484 if newnode is not None:
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	485 newrev = repo[newnode].rev()
33864 70354bd4f19b rebase: only change self.state when collapsing in _finishrebase Jun Wu <quark@fb.com> parents: 33863 diff changeset	486 for oldrev in self.state.iterkeys():
70354bd4f19b rebase: only change self.state when collapsing in _finishrebase Jun Wu <quark@fb.com> parents: 33863 diff changeset	487 self.state[oldrev] = newrev
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	488
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	489 if 'qtip' in repo.tags():
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	490 updatemq(repo, self.state, self.skipped, **opts)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	491
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	492 # restore original working directory
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	493 # (we do this before stripping)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	494 newwd = self.state.get(self.originalwd, self.originalwd)
33843 d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	495 if newwd < 0:
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	496 # original directory is a parent of rebase set root or ignored
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	497 newwd = self.originalwd
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	498 if newwd not in [c.rev() for c in repo[None].parents()]:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	499 ui.note(_("update back to initial working directory parent\n"))
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	500 hg.updaterepo(repo, newwd, False)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	501
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	502 if not self.keepf:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	503 collapsedas = None
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	504 if self.collapsef:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	505 collapsedas = newnode
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	506 clearrebased(ui, repo, self.destmap, self.state, self.skipped,
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	507 collapsedas)
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	508
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	509 clearstatus(repo)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	510 clearcollapsemsg(repo)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	511
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	512 ui.note(_("rebase completed\n"))
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	513 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	514 if self.skipped:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	515 skippedlen = len(self.skipped)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	516 ui.note(_("%d revisions have been skipped\n") % skippedlen)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	517
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	518 if (self.activebookmark and self.activebookmark in repo._bookmarks and
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	519 repo['.'].node() == repo._bookmarks[self.activebookmark]):
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	520 bookmarks.activate(repo, self.activebookmark)
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	521
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	522 @command('rebase',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	523 [('s', 'source', '',
22789 5f4934487382 rebase: attempt to clarify --base Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	524 _('rebase the specified changeset and descendants'), _('REV')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	525 ('b', 'base', '',
22789 5f4934487382 rebase: attempt to clarify --base Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	526 _('rebase everything from branching point of specified changeset'),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	527 _('REV')),
15270 6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	528 ('r', 'rev', [],
6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	529 _('rebase these revisions'),
6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	530 _('REV')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	531 ('d', 'dest', '',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	532 _('rebase onto the specified changeset'), _('REV')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	533 ('', 'collapse', False, _('collapse the rebased changesets')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	534 ('m', 'message', '',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	535 _('use text as collapse commit message'), _('TEXT')),
15219 9d58569a8b92 rebase: add --edit switch Matt Mackall <mpm@selenic.com> parents: 15214 diff changeset	536 ('e', 'edit', False, _('invoke editor on commit messages')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	537 ('l', 'logfile', '',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	538 _('read collapse commit message from file'), _('FILE')),
25025 72f7f98bc5e5 rebase: add short -k option for --keep Nat Mote <nmote@fb.com> parents: 24998 diff changeset	539 ('k', 'keep', False, _('keep original changesets')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	540 ('', 'keepbranches', False, _('keep original branch names')),
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16867 diff changeset	541 ('D', 'detach', False, _('(DEPRECATED)')),
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	542 ('i', 'interactive', False, _('(DEPRECATED)')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	543 ('t', 'tool', '', _('specify merge tool')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	544 ('c', 'continue', False, _('continue an interrupted rebase')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	545 ('a', 'abort', False, _('abort an interrupted rebase'))] +
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	546 templateopts,
17325 e4db509c08ec rebase: remove second broken synopsis line (issue3172) Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	547 _('[-s REV \| -b REV] [-d REV] [OPTION]'))
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	548 def rebase(ui, repo, **opts):
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	549 """move changeset (and descendants) to a different branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	550
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7955 diff changeset	551 Rebase uses repeated merging to graft changesets from one part of
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	552 history (the source) onto another (the destination). This can be
11188 b5c0f6a11430 rebase: stress that only local changesets should be rebased Martin Geisler <mg@lazybytes.net> parents: 10762 diff changeset	553 useful for linearizing local changes relative to a master
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	554 development tree.
86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	555
27454 3e3be524a712 rebase: simplify documentation about public commits timeless <timeless@mozdev.org> parents: 27344 diff changeset	556 Published commits cannot be rebased (see :hg:`help phases`).
3e3be524a712 rebase: simplify documentation about public commits timeless <timeless@mozdev.org> parents: 27344 diff changeset	557 To copy commits, see :hg:`help graft`.
18516 9fbeb61b8ad2 rebase: mention phases in the help Kevin Bullock <kbullock@ringworld.org> parents: 18514 diff changeset	558
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	559 If you don't specify a destination changeset (``-d/--dest``), rebase
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	560 will use the same logic as :hg:`merge` to pick a destination. if
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	561 the current branch contains exactly one other head, the other head
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	562 is merged with by default. Otherwise, an explicit revision with
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	563 which to merge with must be provided. (destination changeset is not
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	564 modified by rebasing, but new changesets are added as its
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	565 descendants.)
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	566
27956 f3eb98b8fe12 doc: prevent non-literal text block from being treated as literal one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27932 diff changeset	567 Here are the ways to select changesets:
27455 a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	568
a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	569 1. Explicitly select them using ``--rev``.
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	570
27455 a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	571 2. Use ``--source`` to select a root changeset and include all of its
27959 4322849a5357 doc: use correct indentation for enumeration FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27956 diff changeset	572 descendants.
27455 a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	573
a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	574 3. Use ``--base`` to select a changeset; rebase will find ancestors
27959 4322849a5357 doc: use correct indentation for enumeration FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27956 diff changeset	575 and their descendants which are not also ancestors of the destination.
18518 0324a1d88a53 rebase: mention --rev in the help Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18516 diff changeset	576
27932 6bc2299cc12f rebase: restore help for rebase w/o args (issue5059) timeless <timeless@mozdev.org> parents: 27866 diff changeset	577 4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
27959 4322849a5357 doc: use correct indentation for enumeration FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27956 diff changeset	578 rebase will use ``--base .`` as above.
27932 6bc2299cc12f rebase: restore help for rebase w/o args (issue5059) timeless <timeless@mozdev.org> parents: 27866 diff changeset	579
27456 2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	580 Rebase will destroy original changesets unless you use ``--keep``.
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	581 It will also move your bookmarks (even if you do).
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	582
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	583 Some changesets may be dropped if they do not contribute changes
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	584 (e.g. merges from the destination branch).
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	585
27457 97cc045f1cfe rebase: simplify documentation about heads timeless <timeless@mozdev.org> parents: 27456 diff changeset	586 Unlike ``merge``, rebase will do nothing if you are at the branch tip of
97cc045f1cfe rebase: simplify documentation about heads timeless <timeless@mozdev.org> parents: 27456 diff changeset	587 a named branch with two heads. You will need to explicitly specify source
97cc045f1cfe rebase: simplify documentation about heads timeless <timeless@mozdev.org> parents: 27456 diff changeset	588 and/or destination.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	589
28001 ade12bf2bf0e rebase: mention help merge-tools in help timeless <timeless@mozdev.org> parents: 27977 diff changeset	590 If you need to use a tool to automate merge/conflict decisions, you
ade12bf2bf0e rebase: mention help merge-tools in help timeless <timeless@mozdev.org> parents: 27977 diff changeset	591 can specify one with ``--tool``, see :hg:`help merge-tools`.
28002 e862b1fd33a8 rebase: document that tool does not apply to deleted files timeless <timeless@mozdev.org> parents: 28001 diff changeset	592 As a caveat: the tool will not be used to mediate when a file was
e862b1fd33a8 rebase: document that tool does not apply to deleted files timeless <timeless@mozdev.org> parents: 28001 diff changeset	593 deleted, there is no hook presently available for this.
28001 ade12bf2bf0e rebase: mention help merge-tools in help timeless <timeless@mozdev.org> parents: 27977 diff changeset	594
27458 d39e743e3578 rebase: mention conflict in documentation instead of merge timeless <timeless@mozdev.org> parents: 27457 diff changeset	595 If a rebase is interrupted to manually resolve a conflict, it can be
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	596 continued with --continue/-c or aborted with --abort/-a.
11205 d26f662bfbf5 rebase: add error codes Matt Mackall <mpm@selenic.com> parents: 11204 diff changeset	597
22790 c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	598 .. container:: verbose
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	599
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	600 Examples:
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	601
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	602 - move "local changes" (current commit back to branching point)
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	603 to the current branch tip after a pull::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	604
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	605 hg rebase
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	606
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	607 - move a single changeset to the stable branch::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	608
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	609 hg rebase -r 5f493448 -d stable
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	610
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	611 - splice a commit and all its descendants onto another part of history::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	612
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	613 hg rebase --source c0c3 --dest 4cf9
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	614
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	615 - rebase everything on a branch marked by a bookmark onto the
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	616 default branch::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	617
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	618 hg rebase --base myfeature --dest default
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	619
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	620 - collapse a sequence of changes into a single commit::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	621
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	622 hg rebase --collapse -r 1520:1525 -d .
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	623
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	624 - move a named branch while preserving its name::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	625
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	626 hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	627
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	628 Configuration Options:
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	629
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	630 You can make rebase require a destination if you set the following config
32084 091d6b9157da help: apply bulk fixes for indentation and literal blocking issues FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32083 diff changeset	631 option::
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	632
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	633 [commands]
32083 1c911adebf48 rebase: fix incorrect configuration example FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31733 diff changeset	634 rebase.requiredest = True
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	635
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	636 By default, rebase will close the transaction after each commit. For
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	637 performance purposes, you can configure rebase to use a single transaction
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	638 across the entire rebase. WARNING: This setting introduces a significant
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	639 risk of losing the work you've done in a rebase if the rebase aborts
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	640 unexpectedly::
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	641
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	642 [rebase]
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	643 singletransaction = True
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	644
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	645 Return Values:
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	646
19971 2a9bb64faa0b rebase: add description about exit code when there are unresolved conflicts FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19969 diff changeset	647 Returns 0 on success, 1 if nothing to rebase or there are
2a9bb64faa0b rebase: add description about exit code when there are unresolved conflicts FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19969 diff changeset	648 unresolved conflicts.
22790 c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	649
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	650 """
29399 adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	651 rbsrt = rebaseruntime(repo, ui, opts)
15219 9d58569a8b92 rebase: add --edit switch Matt Mackall <mpm@selenic.com> parents: 15214 diff changeset	652
32917 070920db8b87 rebase: use context manager for locking in rebase() Martin von Zweigbergk <martinvonz@google.com> parents: 32900 diff changeset	653 with repo.wlock(), repo.lock():
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	654 # Validate input and define rebasing points
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	655 destf = opts.get('dest', None)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	656 srcf = opts.get('source', None)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	657 basef = opts.get('base', None)
15270 6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	658 revf = opts.get('rev', [])
29043 cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	659 # search default destination in this space
cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	660 # used in the 'hg pull --rebase' case, see issue 5214.
cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	661 destspace = opts.get('_destspace')
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	662 contf = opts.get('continue')
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	663 abortf = opts.get('abort')
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	664 if opts.get('interactive'):
26496 b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	665 try:
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	666 if extensions.find('histedit'):
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	667 enablehistedit = ''
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	668 except KeyError:
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	669 enablehistedit = " --config extensions.histedit="
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	670 help = "hg%s help -e histedit" % enablehistedit
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	671 msg = _("interactive history editing is supported by the "
26494 832f40d2af53 rebase: factor out histedit help command timeless@mozdev.org parents: 26421 diff changeset	672 "'histedit' extension (see \"%s\")") % help
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	673 raise error.Abort(msg)
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	674
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	675 if rbsrt.collapsemsg and not rbsrt.collapsef:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	676 raise error.Abort(
13661 ee349e228835 rebase: add -m/--message to rebase --collapse (issue2389) Radomir Dopieralski <sheep@stxnext.pl> parents: 13609 diff changeset	677 _('message can only be specified with collapse'))
ee349e228835 rebase: add -m/--message to rebase --collapse (issue2389) Radomir Dopieralski <sheep@stxnext.pl> parents: 13609 diff changeset	678
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	679 if contf or abortf:
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	680 if contf and abortf:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	681 raise error.Abort(_('cannot use both abort and continue'))
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	682 if rbsrt.collapsef:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	683 raise error.Abort(
11285 f118029e534c rebase: use usual util.abort rather than error.ParseError Matt Mackall <mpm@selenic.com> parents: 11205 diff changeset	684 _('cannot use collapse with continue or abort'))
8117 2b30d8488819 remove unnecessary outer parenthesis in if-statements Martin Geisler <mg@lazybytes.net> parents: 8112 diff changeset	685 if srcf or basef or destf:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	686 raise error.Abort(
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	687 _('abort and continue do not allow specifying revisions'))
26165 927c0d84e09f rebase: fix warning about ignoring tool option on rebase continue (issue4698) liscju <piotr.listkiewicz@gmail.com> parents: 26029 diff changeset	688 if abortf and opts.get('tool', False):
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 13778 diff changeset	689 ui.warn(_('tool option will be ignored\n'))
30273 86f4ef63d507 rebase: check for conflicts before continuing timeless <timeless@mozdev.org> parents: 30271 diff changeset	690 if contf:
86f4ef63d507 rebase: check for conflicts before continuing timeless <timeless@mozdev.org> parents: 30271 diff changeset	691 ms = mergemod.mergestate.read(repo)
30495 d528ddc11b33 rebase: refer to checkunresolved by its new name Augie Fackler <augie@google.com> parents: 30490 diff changeset	692 mergeutil.checkunresolved(ms)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	693
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	694 retcode = rbsrt._prepareabortorcontinue(abortf)
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	695 if retcode is not None:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	696 return retcode
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	697 else:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	698 destmap = _definedestmap(ui, repo, destf, srcf, basef, revf,
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	699 destspace=destspace)
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	700 retcode = rbsrt._preparenewrebase(destmap)
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	701 if retcode is not None:
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	702 return retcode
21027 25ee5dbebc6b rebase: tell when reopening a closed branch head Mads Kiilerich <madski@unity3d.com> parents: 20790 diff changeset	703
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	704 tr = None
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	705 dsguard = None
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	706
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	707 singletr = ui.configbool('rebase', 'singletransaction')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	708 if singletr:
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	709 tr = repo.transaction('rebase')
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	710 with util.acceptintervention(tr):
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	711 if singletr:
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	712 dsguard = dirstateguard.dirstateguard(repo, 'rebase')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	713 with util.acceptintervention(dsguard):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	714 rbsrt._performrebase(tr)
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	715
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	716 rbsrt._finishrebase()
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	717
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	718 def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None,
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	719 destspace=None):
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	720 """use revisions argument to define destmap {srcrev: destrev}"""
31431 406705701c2d rebase: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31395 diff changeset	721 if revf is None:
406705701c2d rebase: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31395 diff changeset	722 revf = []
31395 361bccce566a rebase: don't use mutable default argument value Gregory Szorc <gregory.szorc@gmail.com> parents: 31380 diff changeset	723
29043 cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	724 # destspace is here to work around issues with `hg pull --rebase` see
cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	725 # issue5214 for details
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	726 if srcf and basef:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	727 raise error.Abort(_('cannot specify both a source and a base'))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	728 if revf and basef:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	729 raise error.Abort(_('cannot specify both a revision and a base'))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	730 if revf and srcf:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	731 raise error.Abort(_('cannot specify both a revision and a source'))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	732
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	733 cmdutil.checkunfinished(repo)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	734 cmdutil.bailifchanged(repo)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	735
31731 b5afec71c1f9 rebase: allow destination-free continue and abort (issue5513) Ryan McElroy <rmcelroy@fb.com> parents: 31621 diff changeset	736 if ui.configbool('commands', 'rebase.requiredest') and not destf:
b5afec71c1f9 rebase: allow destination-free continue and abort (issue5513) Ryan McElroy <rmcelroy@fb.com> parents: 31621 diff changeset	737 raise error.Abort(_('you must specify a destination'),
b5afec71c1f9 rebase: allow destination-free continue and abort (issue5513) Ryan McElroy <rmcelroy@fb.com> parents: 31621 diff changeset	738 hint=_('use: hg rebase -d REV'))
b5afec71c1f9 rebase: allow destination-free continue and abort (issue5513) Ryan McElroy <rmcelroy@fb.com> parents: 31621 diff changeset	739
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	740 dest = None
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	741
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	742 if revf:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	743 rebaseset = scmutil.revrange(repo, revf)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	744 if not rebaseset:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	745 ui.status(_('empty "rev" revision set - nothing to rebase\n'))
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	746 return None
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	747 elif srcf:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	748 src = scmutil.revrange(repo, [srcf])
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	749 if not src:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	750 ui.status(_('empty "source" revision set - nothing to rebase\n'))
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	751 return None
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	752 rebaseset = repo.revs('(%ld)::', src)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	753 assert rebaseset
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	754 else:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	755 base = scmutil.revrange(repo, [basef or '.'])
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	756 if not base:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	757 ui.status(_('empty "base" revision set - '
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	758 "can't compute rebase set\n"))
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	759 return None
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	760 if destf:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	761 # --base does not support multiple destinations
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	762 dest = scmutil.revsingle(repo, destf)
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	763 else:
29043 cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	764 dest = repo[_destrebase(repo, base, destspace=destspace)]
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	765 destf = str(dest)
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	766
30580 51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	767 roots = [] # selected children of branching points
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	768 bpbase = {} # {branchingpoint: [origbase]}
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	769 for b in base: # group bases by branching points
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	770 bp = repo.revs('ancestor(%d, %d)', b, dest).first()
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	771 bpbase[bp] = bpbase.get(bp, []) + [b]
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	772 if None in bpbase:
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	773 # emulate the old behavior, showing "nothing to rebase" (a better
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	774 # behavior may be abort with "cannot find branching point" error)
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	775 bpbase.clear()
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	776 for bp, bs in bpbase.iteritems(): # calculate roots
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	777 roots += list(repo.revs('children(%d) & ancestors(%ld)', bp, bs))
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	778
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	779 rebaseset = repo.revs('%ld::', roots)
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	780
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	781 if not rebaseset:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	782 # transform to list because smartsets are not comparable to
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	783 # lists. This should be improved to honor laziness of
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	784 # smartset.
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	785 if list(base) == [dest.rev()]:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	786 if basef:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	787 ui.status(_('nothing to rebase - %s is both "base"'
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	788 ' and destination\n') % dest)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	789 else:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	790 ui.status(_('nothing to rebase - working directory '
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	791 'parent is also destination\n'))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	792 elif not repo.revs('%ld - ::%d', base, dest):
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	793 if basef:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	794 ui.status(_('nothing to rebase - "base" %s is '
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	795 'already an ancestor of destination '
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	796 '%s\n') %
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	797 ('+'.join(str(repo[r]) for r in base),
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	798 dest))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	799 else:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	800 ui.status(_('nothing to rebase - working '
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	801 'directory parent is already an '
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	802 'ancestor of destination %s\n') % dest)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	803 else: # can it happen?
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	804 ui.status(_('nothing to rebase from %s to %s\n') %
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	805 ('+'.join(str(repo[r]) for r in base), dest))
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	806 return None
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	807
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	808 if not destf:
29043 cf7de4aeb86b destutil: add the ability to specify a search space for rebase destination Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28686 diff changeset	809 dest = repo[_destrebase(repo, rebaseset, destspace=destspace)]
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	810 destf = str(dest)
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	811
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	812 allsrc = revsetlang.formatspec('%ld', rebaseset)
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	813 alias = {'ALLSRC': allsrc}
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	814
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	815 if dest is None:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	816 try:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	817 # fast path: try to resolve dest without SRC alias
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	818 dest = scmutil.revsingle(repo, destf, localalias=alias)
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	819 except error.RepoLookupError:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	820 if not ui.configbool('experimental', 'rebase.multidest'):
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	821 raise
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	822 # multi-dest path: resolve dest for each SRC separately
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	823 destmap = {}
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	824 for r in rebaseset:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	825 alias['SRC'] = revsetlang.formatspec('%d', r)
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	826 # use repo.anyrevs instead of scmutil.revsingle because we
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	827 # don't want to abort if destset is empty.
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	828 destset = repo.anyrevs([destf], user=True, localalias=alias)
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	829 size = len(destset)
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	830 if size == 1:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	831 destmap[r] = destset.first()
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	832 elif size == 0:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	833 ui.note(_('skipping %s - empty destination\n') % repo[r])
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	834 else:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	835 raise error.Abort(_('rebase destination for %s is not '
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	836 'unique') % repo[r])
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	837
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	838 if dest is not None:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	839 # single-dest case: assign dest to each rev in rebaseset
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	840 destrev = dest.rev()
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	841 destmap = {r: destrev for r in rebaseset} # {srcrev: destrev}
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	842
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	843 if not destmap:
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	844 ui.status(_('nothing to rebase - empty destination\n'))
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	845 return None
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	846
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	847 return destmap
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	848
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	849 def externalparent(repo, state, destancestors):
19955 2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	850 """Return the revision that should be used as the second parent
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	851 when the revisions in state is collapsed on top of destancestors.
19955 2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	852 Abort if there is more than one parent.
10351 38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	853 """
19955 2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	854 parents = set()
10351 38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	855 source = min(state)
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	856 for rev in state:
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	857 if rev == source:
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	858 continue
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	859 for p in repo[rev].parents():
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	860 if (p.rev() not in state
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	861 and p.rev() not in destancestors):
19955 2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	862 parents.add(p.rev())
2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	863 if not parents:
2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	864 return nullrev
2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	865 if len(parents) == 1:
2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	866 return parents.pop()
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	867 raise error.Abort(_('unable to collapse on top of %s, there is more '
19956 78ab0f85e249 rebase: improve error message for more than one external parent Mads Kiilerich <madski@unity3d.com> parents: 19955 diff changeset	868 'than one external parent: %s') %
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	869 (max(destancestors),
19956 78ab0f85e249 rebase: improve error message for more than one external parent Mads Kiilerich <madski@unity3d.com> parents: 19955 diff changeset	870 ', '.join(str(p) for p in sorted(parents))))
10351 38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	871
26360 b2415e94b2f5 rebase: avoid losing branch commits with --keepbranch (issue4835) timeless@mozdev.org parents: 26349 diff changeset	872 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None,
26868 a2aa39a725a1 rebase: add date parameter to concludenode function Stanislau Hlebik <stash@fb.com> parents: 26811 diff changeset	873 keepbranches=False, date=None):
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	874 '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	875 but also store useful information in extra.
23459 2e047b1558a5 rebase: clarify naming of variables holding node hashes - don't call them rev Mads Kiilerich <madski@unity3d.com> parents: 23457 diff changeset	876 Return node of committed revision.'''
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	877 dsguard = util.nullcontextmanager()
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	878 if not repo.ui.configbool('rebase', 'singletransaction'):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	879 dsguard = dirstateguard.dirstateguard(repo, 'rebase')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	880 with dsguard:
33120 b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	881 repo.setparents(repo[p1].node(), repo[p2].node())
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	882 ctx = repo[rev]
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	883 if commitmsg is None:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	884 commitmsg = ctx.description()
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	885 keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	886 extra = {'rebase_source': ctx.hex()}
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	887 if extrafn:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	888 extrafn(ctx, extra)
22038 021becbf024a rebase: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22004 diff changeset	889
33139 40ee74bfa111 merge with stable Martin von Zweigbergk <martinvonz@google.com> parents: 33056 33121 diff changeset	890 destphase = max(ctx.phase(), phases.draft)
40ee74bfa111 merge with stable Martin von Zweigbergk <martinvonz@google.com> parents: 33056 33121 diff changeset	891 overrides = {('phases', 'new-commit'): destphase}
33120 b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	892 with repo.ui.configoverride(overrides, 'rebase'):
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	893 if keepbranch:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	894 repo.ui.setconfig('ui', 'allowemptycommit', True)
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	895 # Commit might fail if unresolved files exist
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	896 if date is None:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	897 date = ctx.date()
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	898 newnode = repo.commit(text=commitmsg, user=ctx.user(),
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	899 date=date, extra=extra, editor=editor)
22038 021becbf024a rebase: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22004 diff changeset	900
33120 b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	901 repo.dirstate.setbranch(repo[newnode].branch())
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	902 return newnode
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	903
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	904 def rebasenode(repo, rev, p1, base, state, collapse, dest):
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	905 'Rebase a single revision rev on top of p1 using base as merge ancestor'
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	906 # Merge phase
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	907 # Update to destination and merge it with local
23461 ffef6d503ab2 rebase: avoid redundant repo[rev].rev() - just keep working in rev space Mads Kiilerich <madski@unity3d.com> parents: 23460 diff changeset	908 if repo['.'].rev() != p1:
ffef6d503ab2 rebase: avoid redundant repo[rev].rev() - just keep working in rev space Mads Kiilerich <madski@unity3d.com> parents: 23460 diff changeset	909 repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	910 mergemod.update(repo, p1, False, True)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	911 else:
32249 27e67cfea27f rebase: rename "target" to "destination" in messages Martin von Zweigbergk <martinvonz@google.com> parents: 32248 diff changeset	912 repo.ui.debug(" already in destination\n")
26748 5ba0a99ff27f dirstate: make dirstate.write() callers pass transaction object to it FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26745 diff changeset	913 repo.dirstate.write(repo.currenttransaction())
23461 ffef6d503ab2 rebase: avoid redundant repo[rev].rev() - just keep working in rev space Mads Kiilerich <madski@unity3d.com> parents: 23460 diff changeset	914 repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
19969 ad9db007656f rebase: fix selection of base used when rebasing merge (issue4041) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19956 diff changeset	915 if base is not None:
23461 ffef6d503ab2 rebase: avoid redundant repo[rev].rev() - just keep working in rev space Mads Kiilerich <madski@unity3d.com> parents: 23460 diff changeset	916 repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))
16696 d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16566 diff changeset	917 # When collapsing in-place, the parent is the common ancestor, we
d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16566 diff changeset	918 # have to allow merging with it.
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	919 stats = mergemod.update(repo, rev, True, True, base, collapse,
0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	920 labels=['dest', 'source'])
22905 63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	921 if collapse:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	922 copies.duplicatecopies(repo, rev, dest)
22905 63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	923 else:
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	924 # If we're not using --collapse, we need to
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	925 # duplicate copies between the revision we're
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	926 # rebasing and its first parent, but not
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	927 # duplicate any copies that have already been
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	928 # performed in the destination.
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	929 p1rev = repo[rev].p1().rev()
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	930 copies.duplicatecopies(repo, rev, p1rev, skiprev=dest)
22905 63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	931 return stats
6923 ebf1462f2145 strip trailing whitespace, replace tabs by spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6906 diff changeset	932
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	933 def adjustdest(repo, rev, destmap, state):
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	934 """adjust rebase destination given the current rebase state
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	935
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	936 rev is what is being rebased. Return a list of two revs, which are the
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	937 adjusted destinations for rev's p1 and p2, respectively. If a parent is
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	938 nullrev, return dest without adjustment for it.
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	939
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	940 For example, when doing rebasing B+E to F, C to G, rebase will first move B
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	941 to B1, and E's destination will be adjusted from F to B1.
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	942
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	943 B1 <- written during rebasing B
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	944 \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	945 F <- original destination of B, E
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	946 \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	947 \| E <- rev, which is being rebased
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	948 \| \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	949 \| D <- prev, one parent of rev being checked
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	950 \| \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	951 \| x <- skipped, ex. no successor or successor in (::dest)
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	952 \| \|
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	953 \| C <- rebased as C', different destination
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	954 \| \|
34005 5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	955 \| B <- rebased as B1 C'
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	956 \|/ \|
5e83a8fe6bc4 rebase: initial support for multiple destinations Jun Wu <quark@fb.com> parents: 34004 diff changeset	957 A G <- destination of C, different
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	958
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	959 Another example about merge changeset, rebase -r C+G+H -d K, rebase will
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	960 first move C to C1, G to G1, and when it's checking H, the adjusted
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	961 destinations will be [C1, G1].
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	962
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	963 H C1 G1
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	964 /\| \| /
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	965 F G \|/
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	966 K \| \| -> K
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	967 \| C D \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	968 \| \|/ \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	969 \| B \| ...
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	970 \|/ \|/
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	971 A A
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	972 """
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	973 # pick already rebased revs with same dest from state as interesting source
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	974 dest = destmap[rev]
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	975 source = [s for s, d in state.items() if d > 0 and destmap[s] == dest]
33849 3ae2eaecb49e rebase: optimize "source" calculation in adjustdest Jun Wu <quark@fb.com> parents: 33848 diff changeset	976
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	977 result = []
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	978 for prev in repo.changelog.parentrevs(rev):
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	979 adjusted = dest
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	980 if prev != nullrev:
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	981 candidate = repo.revs('max(%ld and (::%d))', source, prev).first()
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	982 if candidate is not None:
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	983 adjusted = state[candidate]
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	984 result.append(adjusted)
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	985 return result
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	986
33846 3b04a6ff625c rebase: remove rebaseset from _checkobsrebase Jun Wu <quark@fb.com> parents: 33845 diff changeset	987 def _checkobsrebase(repo, ui, rebaseobsrevs, rebaseobsskipped):
28685 6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	988 """
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	989 Abort if rebase will create divergence or rebase is noop because of markers
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	990
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	991 `rebaseobsrevs`: set of obsolete revision in source
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	992 `rebaseobsskipped`: set of revisions from source skipped because they have
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	993 successors in destination
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	994 """
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	995 # Obsolete node with successors not in dest leads to divergence
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	996 divergenceok = ui.configbool('experimental',
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	997 'allowdivergence')
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	998 divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	999
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1000 if divergencebasecandidates and not divergenceok:
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1001 divhashes = (str(repo[r])
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1002 for r in divergencebasecandidates)
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1003 msg = _("this rebase will cause "
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1004 "divergences from: %s")
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1005 h = _("to force the rebase please set "
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1006 "experimental.allowdivergence=True")
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1007 raise error.Abort(msg % (",".join(divhashes),), hint=h)
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	1008
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1009 def successorrevs(repo, rev):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1010 """yield revision numbers for successors of rev"""
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1011 unfi = repo.unfiltered()
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1012 nodemap = unfi.changelog.nodemap
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1013 for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1014 if s in nodemap:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1015 yield nodemap[s]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1016
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1017 def defineparents(repo, rev, destmap, state):
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1018 """Return new parents and optionally a merge base for rev being rebased
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1019
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1020 The destination specified by "dest" cannot always be used directly because
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1021 previously rebase result could affect destination. For example,
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1022
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1023 D E rebase -r C+D+E -d B
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1024 \|/ C will be rebased to C'
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1025 B C D's new destination will be C' instead of B
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1026 \|/ E's new destination will be C' instead of B
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1027 A
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1028
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1029 The new parents of a merge is slightly more complicated. See the comment
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1030 block below.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1031 """
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1032 cl = repo.changelog
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1033 def isancestor(a, b):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1034 # take revision numbers instead of nodes
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1035 if a == b:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1036 return True
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1037 elif a > b:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1038 return False
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1039 return cl.isancestor(cl.node(a), cl.node(b))
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1040
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1041 dest = destmap[rev]
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1042 oldps = repo.changelog.parentrevs(rev) # old parents
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1043 newps = [nullrev, nullrev] # new parents
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1044 dests = adjustdest(repo, rev, destmap, state) # adjusted destinations
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1045 bases = list(oldps) # merge base candidates, initially just old parents
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1046
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1047 if all(r == nullrev for r in oldps[1:]):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1048 # For non-merge changeset, just move p to adjusted dest as requested.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1049 newps[0] = dests[0]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1050 else:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1051 # For merge changeset, if we move p to dests[i] unconditionally, both
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1052 # parents may change and the end result looks like "the merge loses a
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1053 # parent", which is a surprise. This is a limit because "--dest" only
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1054 # accepts one dest per src.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1055 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1056 # Therefore, only move p with reasonable conditions (in this order):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1057 # 1. use dest, if dest is a descendent of (p or one of p's successors)
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1058 # 2. use p's rebased result, if p is rebased (state[p] > 0)
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1059 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1060 # Comparing with adjustdest, the logic here does some additional work:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1061 # 1. decide which parents will not be moved towards dest
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1062 # 2. if the above decision is "no", should a parent still be moved
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1063 # because it was rebased?
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1064 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1065 # For example:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1066 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1067 # C # "rebase -r C -d D" is an error since none of the parents
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1068 # /\| # can be moved. "rebase -r B+C -d D" will move C's parent
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1069 # A B D # B (using rule "2."), since B will be rebased.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1070 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1071 # The loop tries to be not rely on the fact that a Mercurial node has
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1072 # at most 2 parents.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1073 for i, p in enumerate(oldps):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1074 np = p # new parent
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1075 if any(isancestor(x, dests[i]) for x in successorrevs(repo, p)):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1076 np = dests[i]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1077 elif p in state and state[p] > 0:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1078 np = state[p]
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	1079
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1080 # "bases" only record "special" merge bases that cannot be
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1081 # calculated from changelog DAG (i.e. isancestor(p, np) is False).
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1082 # For example:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1083 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1084 # B' # rebase -s B -d D, when B was rebased to B'. dest for C
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1085 # \| C # is B', but merge base for C is B, instead of
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1086 # D \| # changelog.ancestor(C, B') == A. If changelog DAG and
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1087 # \| B # "state" edges are merged (so there will be an edge from
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1088 # \|/ # B to B'), the merge base is still ancestor(C, B') in
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1089 # A # the merged graph.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1090 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1091 # Also see https://bz.mercurial-scm.org/show_bug.cgi?id=1950#c8
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1092 # which uses "virtual null merge" to explain this situation.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1093 if isancestor(p, np):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1094 bases[i] = nullrev
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1095
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1096 # If one parent becomes an ancestor of the other, drop the ancestor
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1097 for j, x in enumerate(newps[:i]):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1098 if x == nullrev:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1099 continue
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1100 if isancestor(np, x): # CASE-1
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1101 np = nullrev
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1102 elif isancestor(x, np): # CASE-2
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1103 newps[j] = np
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1104 np = nullrev
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1105 # New parents forming an ancestor relationship does not
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1106 # mean the old parents have a similar relationship. Do not
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1107 # set bases[x] to nullrev.
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1108 bases[j], bases[i] = bases[i], bases[j]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1109
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1110 newps[i] = np
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1111
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1112 # "rebasenode" updates to new p1, and the old p1 will be used as merge
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1113 # base. If only p2 changes, merging using unchanged p1 as merge base is
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1114 # suboptimal. Therefore swap parents to make the merge sane.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1115 if newps[1] != nullrev and oldps[0] == newps[0]:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1116 assert len(newps) == 2 and len(oldps) == 2
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1117 newps.reverse()
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1118 bases.reverse()
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1119
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1120 # No parent change might be an error because we fail to make rev a
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1121 # descendent of requested dest. This can happen, for example:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1122 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1123 # C # rebase -r C -d D
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1124 # /\| # None of A and B will be changed to D and rebase fails.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1125 # A B D
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1126 if set(newps) == set(oldps) and dest not in newps:
33789 19f495fef0a3 rebase: change "result would have 3 parent" error message (BC) Jun Wu <quark@fb.com> parents: 33786 diff changeset	1127 raise error.Abort(_('cannot rebase %d:%s without '
19f495fef0a3 rebase: change "result would have 3 parent" error message (BC) Jun Wu <quark@fb.com> parents: 33786 diff changeset	1128 'moving at least one of its parents')
19f495fef0a3 rebase: change "result would have 3 parent" error message (BC) Jun Wu <quark@fb.com> parents: 33786 diff changeset	1129 % (rev, repo[rev]))
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1130
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1131 # "rebasenode" updates to new p1, use the corresponding merge base.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1132 if bases[0] != nullrev:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1133 base = bases[0]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1134 else:
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	1135 base = None
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1136
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1137 # Check if the merge will contain unwanted changes. That may happen if
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1138 # there are multiple special (non-changelog ancestor) merge bases, which
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1139 # cannot be handled well by the 3-way merge algorithm. For example:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1140 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1141 # F
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1142 # /\|
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1143 # D E # "rebase -r D+E+F -d Z", when rebasing F, if "D" was chosen
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1144 # \| \| # as merge base, the difference between D and F will include
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1145 # B C # C, so the rebased F will contain C surprisingly. If "E" was
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1146 # \|/ # chosen, the rebased F will contain B.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1147 # A Z
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1148 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1149 # But our merge base candidates (D and E in above case) could still be
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1150 # better than the default (ancestor(F, Z) == null). Therefore still
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1151 # pick one (so choose p1 above).
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1152 if sum(1 for b in bases if b != nullrev) > 1:
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1153 unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i]
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1154 for i, base in enumerate(bases):
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1155 if base == nullrev:
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1156 continue
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1157 # Revisions in the side (not chosen as merge base) branch that
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1158 # might contain "surprising" contents
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1159 siderevs = list(repo.revs('((%ld-%d) %% (%d+%d))',
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1160 bases, base, base, dest))
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	1161
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1162 # If those revisions are covered by rebaseset, the result is good.
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1163 # A merge in rebaseset would be considered to cover its ancestors.
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1164 if siderevs:
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1165 rebaseset = [r for r, d in state.items() if d > 0]
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1166 merges = [r for r in rebaseset
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1167 if cl.parentrevs(r)[1] != nullrev]
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1168 unwanted[i] = list(repo.revs('%ld - (::%ld) - %ld',
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1169 siderevs, merges, rebaseset))
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1170
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1171 # Choose a merge base that has a minimal number of unwanted revs.
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1172 l, i = min((len(revs), i)
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1173 for i, revs in enumerate(unwanted) if revs is not None)
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1174 base = bases[i]
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1175
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1176 # newps[0] should match merge base if possible. Currently, if newps[i]
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1177 # is nullrev, the only case is newps[i] and newps[j] (j < i), one is
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1178 # the other's ancestor. In that case, it's fine to not swap newps here.
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1179 # (see CASE-1 and CASE-2 above)
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1180 if i != 0 and newps[i] != nullrev:
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1181 newps[0], newps[i] = newps[i], newps[0]
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1182
33863 3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1183 # The merge will include unwanted revisions. Abort now. Revisit this if
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1184 # we have a more advanced merge algorithm that handles multiple bases.
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1185 if l > 0:
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1186 unwanteddesc = _(' or ').join(
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1187 (', '.join('%d:%s' % (r, repo[r]) for r in revs)
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1188 for revs in unwanted if revs is not None))
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1189 raise error.Abort(
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1190 _('rebasing %d:%s will include unwanted changes from %s')
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1191 % (rev, repo[rev], unwanteddesc))
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1192
3160876c6e4e rebase: choose merge base without unwanted revisions Jun Wu <quark@fb.com> parents: 33849 diff changeset	1193 repo.ui.debug(" future parents are %d and %d\n" % tuple(newps))
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1194
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1195 return newps[0], newps[1], base
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1196
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1197 def isagitpatch(repo, patchname):
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1198 'Return true if the given patch is in git format'
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1199 mqpatch = os.path.join(repo.mq.path, patchname)
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1200 for line in patch.linereader(file(mqpatch, 'rb')):
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1201 if line.startswith('diff --git'):
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1202 return True
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1203 return False
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1204
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1205 def updatemq(repo, state, skipped, **opts):
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1206 'Update rebased mq patches - finalize and then import them'
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1207 mqrebase = {}
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1208 mq = repo.mq
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14509 diff changeset	1209 original_series = mq.fullseries[:]
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1210 skippedpatches = set()
14497 ea585f2b1adc rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 13894 diff changeset	1211
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1212 for p in mq.applied:
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1213 rev = repo[p.node].rev()
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1214 if rev in state:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9301 diff changeset	1215 repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' %
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1216 (rev, p.name))
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1217 mqrebase[rev] = (p.name, isagitpatch(repo, p.name))
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1218 else:
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1219 # Applied but not rebased, not sure this should happen
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1220 skippedpatches.add(p.name)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1221
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1222 if mqrebase:
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1223 mq.finish(repo, mqrebase.keys())
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1224
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1225 # We must start import from the newest revision
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	1226 for rev in sorted(mqrebase, reverse=True):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1227 if rev not in skipped:
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1228 name, isgit = mqrebase[rev]
23520 de143427c499 rebase: show a note for updated mq patches Mads Kiilerich <mads@kiilerich.com> parents: 23519 diff changeset	1229 repo.ui.note(_('updating mq patch %s to %s:%s\n') %
de143427c499 rebase: show a note for updated mq patches Mads Kiilerich <mads@kiilerich.com> parents: 23519 diff changeset	1230 (name, state[rev], repo[state[rev]]))
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1231 mq.qimport(repo, (), patchname=name, git=isgit,
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1232 rev=[str(state[rev])])
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1233 else:
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1234 # Rebased and skipped
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1235 skippedpatches.add(mqrebase[rev][0])
14497 ea585f2b1adc rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 13894 diff changeset	1236
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1237 # Patches were either applied and rebased and imported in
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1238 # order, applied and removed or unapplied. Discard the removed
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1239 # ones while preserving the original series order and guards.
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1240 newseries = [s for s in original_series
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1241 if mq.guard_re.split(s, 1)[0] not in skippedpatches]
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1242 mq.fullseries[:] = newseries
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1243 mq.seriesdirty = True
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	1244 mq.savedirty()
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1245
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1246 def storecollapsemsg(repo, collapsemsg):
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1247 'Store the collapse message to allow recovery'
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1248 collapsemsg = collapsemsg or ''
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1249 f = repo.vfs("last-message.txt", "w")
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1250 f.write("%s\n" % collapsemsg)
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1251 f.close()
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1252
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1253 def clearcollapsemsg(repo):
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1254 'Remove collapse message file'
31311 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31302 diff changeset	1255 repo.vfs.unlinkpath("last-message.txt", ignoremissing=True)
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1256
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1257 def restorecollapsemsg(repo, isabort):
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1258 'Restore previously stored collapse message'
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1259 try:
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1260 f = repo.vfs("last-message.txt")
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1261 collapsemsg = f.readline().strip()
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1262 f.close()
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1263 except IOError as err:
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1264 if err.errno != errno.ENOENT:
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1265 raise
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1266 if isabort:
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1267 # Oh well, just abort like normal
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1268 collapsemsg = ''
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1269 else:
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1270 raise error.Abort(_('missing .hg/last-message.txt for rebase'))
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1271 return collapsemsg
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1272
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1273 def clearstatus(repo):
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1274 'Remove the status files'
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1275 _clearrebasesetvisibiliy(repo)
33056 2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1276 # Make sure the active transaction won't write the state file
2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1277 tr = repo.currenttransaction()
2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1278 if tr:
2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1279 tr.removefilegenerator('rebasestate')
31311 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31302 diff changeset	1280 repo.vfs.unlinkpath("rebasestate", ignoremissing=True)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1281
25070 bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1282 def needupdate(repo, state):
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1283 '''check whether we should `update --clean` away from a merge, or if
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1284 somehow the working dir got forcibly updated, e.g. by older hg'''
27167 3fe8cb40c9c5 commands: inline definition of localrepo.parents() and drop the method (API) Augie Fackler <augie@google.com> parents: 27146 diff changeset	1285 parents = [p.rev() for p in repo[None].parents()]
25070 bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1286
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1287 # Are we in a merge state at all?
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1288 if len(parents) < 2:
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1289 return False
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1290
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1291 # We should be standing on the first as-of-yet unrebased commit.
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1292 firstunrebased = min([old for old, new in state.iteritems()
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1293 if new == nullrev])
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1294 if firstunrebased in parents:
19516 fe78eb7bcca0 rebase: don't clobber wd on --abort when we've updated away (issue4009) Matt Mackall <mpm@selenic.com> parents: 19496 diff changeset	1295 return True
fe78eb7bcca0 rebase: don't clobber wd on --abort when we've updated away (issue4009) Matt Mackall <mpm@selenic.com> parents: 19496 diff changeset	1296
fe78eb7bcca0 rebase: don't clobber wd on --abort when we've updated away (issue4009) Matt Mackall <mpm@selenic.com> parents: 19496 diff changeset	1297 return False
fe78eb7bcca0 rebase: don't clobber wd on --abort when we've updated away (issue4009) Matt Mackall <mpm@selenic.com> parents: 19496 diff changeset	1298
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1299 def abort(repo, originalwd, destmap, state, activebookmark=None):
24758 d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1300 '''Restore the repository to its original state. Additional args:
d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1301
d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1302 activebookmark: the name of the bookmark that should be active after the
d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1303 restore'''
26677 e9b3d523f2e6 rebase: properly abort when destination is public (issue4896) Christian Delahousse <cdelahousse@fb.com> parents: 26675 diff changeset	1304
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1305 try:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1306 # If the first commits in the rebased set get skipped during the rebase,
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	1307 # their values within the state mapping will be the dest rev id. The
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	1308 # dstates list must must not contain the dest rev (issue4896)
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1309 dstates = [s for r, s in state.items() if s >= 0 and s != destmap[r]]
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1310 immutable = [d for d in dstates if not repo[d].mutable()]
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1311 cleanup = True
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1312 if immutable:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1313 repo.ui.warn(_("warning: can't clean up public changesets %s\n")
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1314 % ', '.join(str(repo[r]) for r in immutable),
29966 11604da46982 rebase: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29936 diff changeset	1315 hint=_("see 'hg help phases' for details"))
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1316 cleanup = False
16280 0806823370d8 rebase: properly calculate descendant set when aborting (issue3332) Matt Mackall <mpm@selenic.com> parents: 16228 diff changeset	1317
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1318 descendants = set()
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1319 if dstates:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1320 descendants = set(repo.changelog.descendants(dstates))
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1321 if descendants - set(dstates):
32249 27e67cfea27f rebase: rename "target" to "destination" in messages Martin von Zweigbergk <martinvonz@google.com> parents: 32248 diff changeset	1322 repo.ui.warn(_("warning: new changesets detected on destination "
27e67cfea27f rebase: rename "target" to "destination" in messages Martin von Zweigbergk <martinvonz@google.com> parents: 32248 diff changeset	1323 "branch, can't strip\n"))
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1324 cleanup = False
19518 12843143663d rebase: allow aborting when descendants detected Matt Mackall <mpm@selenic.com> parents: 19517 diff changeset	1325
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1326 if cleanup:
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1327 shouldupdate = False
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1328 rebased = [s for r, s in state.items()
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1329 if s >= 0 and s != destmap[r]]
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1330 if rebased:
61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1331 strippoints = [
61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1332 c.node() for c in repo.set('roots(%ld)', rebased)]
31222 56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1333
56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1334 updateifonnodes = set(rebased)
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1335 updateifonnodes.update(destmap.values())
31222 56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1336 updateifonnodes.add(originalwd)
56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1337 shouldupdate = repo['.'].rev() in updateifonnodes
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1338
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1339 # Update away from the rebase if necessary
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1340 if shouldupdate or needupdate(repo, state):
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	1341 mergemod.update(repo, originalwd, False, True)
19516 fe78eb7bcca0 rebase: don't clobber wd on --abort when we've updated away (issue4009) Matt Mackall <mpm@selenic.com> parents: 19496 diff changeset	1342
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1343 # Strip from the first rebased revision
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1344 if rebased:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1345 # no backup of rebased cset versions needed
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1346 repair.strip(repo.ui, repo, strippoints)
19518 12843143663d rebase: allow aborting when descendants detected Matt Mackall <mpm@selenic.com> parents: 19517 diff changeset	1347
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1348 if activebookmark and activebookmark in repo._bookmarks:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1349 bookmarks.activate(repo, activebookmark)
24758 d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1350
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1351 finally:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1352 clearstatus(repo)
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1353 clearcollapsemsg(repo)
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1354 repo.ui.warn(_('rebase aborted\n'))
19518 12843143663d rebase: allow aborting when descendants detected Matt Mackall <mpm@selenic.com> parents: 19517 diff changeset	1355 return 0
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1356
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1357 def buildstate(repo, destmap, collapse, obsoletenotrebased):
15267 3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15219 diff changeset	1358 '''Define which revisions are going to be rebased and where
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1359
15267 3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15219 diff changeset	1360 repo: repo
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1361 destmap: {srcrev: destrev}
17005 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16867 diff changeset	1362 '''
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1363 rebaseset = destmap.keys()
31297 f5c71e98f0f7 rebase: unhide original working directory node as well (issue5219) Martin von Zweigbergk <martinvonz@google.com> parents: 31296 diff changeset	1364 originalwd = repo['.'].rev()
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32272 diff changeset	1365 _setrebasesetvisibility(repo, set(rebaseset) \| {originalwd})
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1366
10672 c2e1e637d4da rebase: always check if rebasing onto an applied mq patch. Greg Ward <greg-hg@gerg.ca> parents: 10659 diff changeset	1367 # This check isn't strictly necessary, since mq detects commits over an
c2e1e637d4da rebase: always check if rebasing onto an applied mq patch. Greg Ward <greg-hg@gerg.ca> parents: 10659 diff changeset	1368 # applied patch. But it prevents messing up the working directory when
c2e1e637d4da rebase: always check if rebasing onto an applied mq patch. Greg Ward <greg-hg@gerg.ca> parents: 10659 diff changeset	1369 # a partially completed rebase is blocked by mq.
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1370 if 'qtip' in repo.tags():
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1371 mqapplied = set(repo[s.node].rev() for s in repo.mq.applied)
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1372 if set(destmap.values()) & mqapplied:
af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1373 raise error.Abort(_('cannot rebase onto an applied mq patch'))
10672 c2e1e637d4da rebase: always check if rebasing onto an applied mq patch. Greg Ward <greg-hg@gerg.ca> parents: 10659 diff changeset	1374
15267 3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15219 diff changeset	1375 roots = list(repo.set('roots(%ld)', rebaseset))
3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15219 diff changeset	1376 if not roots:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	1377 raise error.Abort(_('no matching revisions'))
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1378 roots.sort()
32175 456b4a32d75f rebase: don't update state dict same way for each root Martin von Zweigbergk <martinvonz@google.com> parents: 32084 diff changeset	1379 state = dict.fromkeys(rebaseset, revtodo)
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1380 emptyrebase = True
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1381 for root in roots:
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1382 dest = repo[destmap[root.rev()]]
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1383 commonbase = root.ancestor(dest)
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1384 if commonbase == root:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	1385 raise error.Abort(_('source is ancestor of destination'))
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1386 if commonbase == dest:
31380 65d93d712777 rebase: allow rebasing children of wd to wd if a new branch has been set (BC) Mads Kiilerich <mads@kiilerich.com> parents: 31311 diff changeset	1387 wctx = repo[None]
65d93d712777 rebase: allow rebasing children of wd to wd if a new branch has been set (BC) Mads Kiilerich <mads@kiilerich.com> parents: 31311 diff changeset	1388 if dest == wctx.p1():
65d93d712777 rebase: allow rebasing children of wd to wd if a new branch has been set (BC) Mads Kiilerich <mads@kiilerich.com> parents: 31311 diff changeset	1389 # when rebasing to '.', it will use the current wd branch name
65d93d712777 rebase: allow rebasing children of wd to wd if a new branch has been set (BC) Mads Kiilerich <mads@kiilerich.com> parents: 31311 diff changeset	1390 samebranch = root.branch() == wctx.branch()
65d93d712777 rebase: allow rebasing children of wd to wd if a new branch has been set (BC) Mads Kiilerich <mads@kiilerich.com> parents: 31311 diff changeset	1391 else:
65d93d712777 rebase: allow rebasing children of wd to wd if a new branch has been set (BC) Mads Kiilerich <mads@kiilerich.com> parents: 31311 diff changeset	1392 samebranch = root.branch() == dest.branch()
32900 07d5a503124c rebase: rewrite "x in y.children()" as "y in x.parents()" Martin von Zweigbergk <martinvonz@google.com> parents: 32594 diff changeset	1393 if not collapse and samebranch and dest in root.parents():
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1394 # mark the revision as done by setting its new revision
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1395 # equal to its old (current) revisions
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1396 state[root.rev()] = root.rev()
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1397 repo.ui.debug('source is a child of destination\n')
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1398 continue
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1399
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1400 emptyrebase = False
29936 3e7ded768556 rebase: make debug logging more consistent Martin von Zweigbergk <martinvonz@google.com> parents: 29872 diff changeset	1401 repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root))
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1402 if emptyrebase:
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1403 return None
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1404 for rev in sorted(state):
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1405 parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev]
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1406 # if all parents of this revision are done, then so is this revision
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1407 if parents and all((state.get(p) == p for p in parents)):
78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1408 state[rev] = rev
33842 30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1409 unfi = repo.unfiltered()
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1410 for r in obsoletenotrebased:
33842 30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1411 desc = _ctxdesc(unfi[r])
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1412 succ = obsoletenotrebased[r]
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1413 if succ is None:
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1414 msg = _('note: not rebasing %s, it has no successor\n') % desc
33843 d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	1415 del state[r]
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1416 del destmap[r]
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1417 else:
33842 30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1418 destctx = unfi[succ]
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1419 destdesc = '%d:%s "%s"' % (destctx.rev(), destctx,
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1420 destctx.description().split('\n', 1)[0])
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1421 msg = (_('note: not rebasing %s, already in destination as %s\n')
30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1422 % (desc, destdesc))
33843 d8d0ef5f5975 rebase: remove revprecursor and revpruned states (BC) Jun Wu <quark@fb.com> parents: 33842 diff changeset	1423 del state[r]
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1424 del destmap[r]
33842 30573b3d2ebc rebase: move obsoleted not rebased messages earlier (BC) Jun Wu <quark@fb.com> parents: 33841 diff changeset	1425 repo.ui.status(msg)
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1426 return originalwd, destmap, state
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1427
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1428 def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None):
17613 aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	1429 """dispose of rebased revision at the end of the rebase
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	1430
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	1431 If `collapsedas` is not None, the rebase was a collapse whose result if the
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	1432 `collapsedas` node."""
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	1433 tonode = repo.changelog.node
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1434 # Move bookmark of skipped nodes to destination. This cannot be handled
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1435 # by scmutil.cleanupnodes since it will treat rev as removed (no successor)
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1436 # and move bookmark backwards.
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1437 bmchanges = [(name, tonode(max(adjustdest(repo, rev, destmap, state))))
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1438 for rev in skipped
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1439 for name in repo.nodebookmarks(tonode(rev))]
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1440 if bmchanges:
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1441 with repo.transaction('rebase') as tr:
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1442 repo._bookmarks.applychanges(repo, tr, bmchanges)
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	1443 mapping = {}
33333 8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1444 for rev, newrev in sorted(state.items()):
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1445 if newrev >= 0 and newrev != rev:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1446 if rev in skipped:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1447 succs = ()
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1448 elif collapsedas is not None:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1449 succs = (collapsedas,)
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1450 else:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1451 succs = (tonode(newrev),)
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1452 mapping[tonode(rev)] = succs
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1453 scmutil.cleanupnodes(repo, mapping, 'rebase')
17611 910123eac887 rebase: extract final changesets cleanup logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17325 diff changeset	1454
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	1455 def pullrebase(orig, ui, repo, args, *opts):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1456 'Call rebase after pull if the latter has been invoked with --rebase'
26960 6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1457 ret = None
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1458 if opts.get('rebase'):
31733 ae6bab095c66 rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514) Ryan McElroy <rmcelroy@fb.com> parents: 31731 diff changeset	1459 if ui.configbool('commands', 'rebase.requiredest'):
ae6bab095c66 rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514) Ryan McElroy <rmcelroy@fb.com> parents: 31731 diff changeset	1460 msg = _('rebase destination required by configuration')
ae6bab095c66 rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514) Ryan McElroy <rmcelroy@fb.com> parents: 31731 diff changeset	1461 hint = _('use hg pull followed by hg rebase -d DEST')
ae6bab095c66 rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514) Ryan McElroy <rmcelroy@fb.com> parents: 31731 diff changeset	1462 raise error.Abort(msg, hint=hint)
ae6bab095c66 rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514) Ryan McElroy <rmcelroy@fb.com> parents: 31731 diff changeset	1463
32918 04c9dd951a41 rebase: use context manager for locking in pullrebase() Martin von Zweigbergk <martinvonz@google.com> parents: 32917 diff changeset	1464 with repo.wlock(), repo.lock():
26029 563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1465 if opts.get('update'):
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1466 del opts['update']
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1467 ui.debug('--update and --rebase are not compatible, ignoring '
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1468 'the update flag\n')
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1469
30725 c2bd2f77965b rebase: fail-fast the pull if working dir is not clean (BC) Valters Vingolds <valters@vingolds.ch> parents: 30709 diff changeset	1470 cmdutil.checkunfinished(repo)
30755 0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30725 diff changeset	1471 cmdutil.bailifchanged(repo, hint=_('cannot pull with rebase: '
0fbb3a5c188e rebase: provide detailed hint to abort message if working dir is not clean Valters Vingolds <valters@vingolds.ch> parents: 30725 diff changeset	1472 'please commit or shelve your changes first'))
30725 c2bd2f77965b rebase: fail-fast the pull if working dir is not clean (BC) Valters Vingolds <valters@vingolds.ch> parents: 30709 diff changeset	1473
26029 563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1474 revsprepull = len(repo)
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1475 origpostincoming = commands.postincoming
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1476 def _dummy(args, *kwargs):
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1477 pass
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1478 commands.postincoming = _dummy
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1479 try:
26960 6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1480 ret = orig(ui, repo, args, *opts)
26029 563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1481 finally:
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1482 commands.postincoming = origpostincoming
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1483 revspostpull = len(repo)
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1484 if revspostpull > revsprepull:
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1485 # --rev option from pull conflict with rebase own --rev
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1486 # dropping it
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1487 if 'rev' in opts:
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1488 del opts['rev']
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1489 # positional argument from pull conflicts with rebase's own
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1490 # --source.
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1491 if 'source' in opts:
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1492 del opts['source']
29044 261c25372959 rebase: restrict rebase destination to the pulled set (issue5214) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29043 diff changeset	1493 # revsprepull is the len of the repo, not revnum of tip.
261c25372959 rebase: restrict rebase destination to the pulled set (issue5214) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29043 diff changeset	1494 destspace = list(repo.changelog.revs(start=revsprepull))
261c25372959 rebase: restrict rebase destination to the pulled set (issue5214) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29043 diff changeset	1495 opts['_destspace'] = destspace
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1496 try:
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1497 rebase(ui, repo, **opts)
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1498 except error.NoMergeDestAbort:
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1499 # we can maybe update instead
28118 0e3835c7e1cf rebase: perform update through the 'update' command Pierre-Yves David <pierre-yves.david@fb.com> parents: 28117 diff changeset	1500 rev, _a, _b = destutil.destupdate(repo)
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1501 if rev == repo['.'].rev():
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1502 ui.status(_('nothing to rebase\n'))
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1503 else:
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	1504 ui.status(_('nothing to rebase - updating instead\n'))
28118 0e3835c7e1cf rebase: perform update through the 'update' command Pierre-Yves David <pierre-yves.david@fb.com> parents: 28117 diff changeset	1505 # not passing argument to get the bare update behavior
0e3835c7e1cf rebase: perform update through the 'update' command Pierre-Yves David <pierre-yves.david@fb.com> parents: 28117 diff changeset	1506 # with warning and trumpets
0e3835c7e1cf rebase: perform update through the 'update' command Pierre-Yves David <pierre-yves.david@fb.com> parents: 28117 diff changeset	1507 commands.update(ui, repo)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1508 else:
14444 1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1509 if opts.get('tool'):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	1510 raise error.Abort(_('--tool can only be used with --rebase'))
26960 6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1511 ret = orig(ui, repo, args, *opts)
6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1512
6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1513 return ret
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1514
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1515 def _setrebasesetvisibility(repo, revs):
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1516 """store the currently rebased set on the repo object
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1517
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1518 This is used by another function to prevent rebased revision to because
30865 01512564ddd5 rebase: fix code comment to refer to right issue (4504, not 4505) Martin von Zweigbergk <martinvonz@google.com> parents: 30755 diff changeset	1519 hidden (see issue4504)"""
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1520 repo = repo.unfiltered()
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1521 repo._rebaseset = revs
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1522 # invalidate cache if visibility changes
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1523 hiddens = repo.filteredrevcache.get('visible', set())
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1524 if revs & hiddens:
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1525 repo.invalidatevolatilesets()
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1526
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1527 def _clearrebasesetvisibiliy(repo):
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1528 """remove rebaseset data from the repo"""
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1529 repo = repo.unfiltered()
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1530 if '_rebaseset' in vars(repo):
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1531 del repo._rebaseset
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1532
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1533 def _rebasedvisible(orig, repo):
30865 01512564ddd5 rebase: fix code comment to refer to right issue (4504, not 4505) Martin von Zweigbergk <martinvonz@google.com> parents: 30755 diff changeset	1534 """ensure rebased revs stay visible (see issue4504)"""
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1535 blockers = orig(repo)
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1536 blockers.update(getattr(repo, '_rebaseset', ()))
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1537 return blockers
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1538
27790 2d294dada4f8 rebase: small refactoring to allow better extensibility from extensions Laurent Charignon <lcharignon@fb.com> parents: 27746 diff changeset	1539 def _filterobsoleterevs(repo, revs):
2d294dada4f8 rebase: small refactoring to allow better extensibility from extensions Laurent Charignon <lcharignon@fb.com> parents: 27746 diff changeset	1540 """returns a set of the obsolete revisions in revs"""
2d294dada4f8 rebase: small refactoring to allow better extensibility from extensions Laurent Charignon <lcharignon@fb.com> parents: 27746 diff changeset	1541 return set(r for r in revs if repo[r].obsolete())
2d294dada4f8 rebase: small refactoring to allow better extensibility from extensions Laurent Charignon <lcharignon@fb.com> parents: 27746 diff changeset	1542
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1543 def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap):
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1544 """return a mapping obsolete => successor for all obsolete nodes to be
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1545 rebased that have a successors in the destination
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1546
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30273 diff changeset	1547 obsolete => None entries in the mapping indicate nodes with no successor"""
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1548 obsoletenotrebased = {}
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1549
34003 ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1550 cl = repo.unfiltered().changelog
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1551 nodemap = cl.nodemap
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1552 for srcrev in rebaseobsrevs:
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1553 srcnode = cl.node(srcrev)
34004 af609bb3487f rebase: change internal format to support destination map Jun Wu <quark@fb.com> parents: 34003 diff changeset	1554 destnode = cl.node(destmap[srcrev])
34003 ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1555 # XXX: more advanced APIs are required to handle split correctly
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1556 successors = list(obsutil.allsuccessors(repo.obsstore, [srcnode]))
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1557 if len(successors) == 1:
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1558 # obsutil.allsuccessors includes node itself. When the list only
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1559 # contains one element, it means there are no successors.
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1560 obsoletenotrebased[srcrev] = None
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1561 else:
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1562 for succnode in successors:
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1563 if succnode == srcnode or succnode not in nodemap:
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1564 continue
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1565 if cl.isancestor(succnode, destnode):
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1566 obsoletenotrebased[srcrev] = nodemap[succnode]
ba9d5d48bf95 rebase: rewrite _computeobsoletenotrebased Jun Wu <quark@fb.com> parents: 33864 diff changeset	1567 break
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1568
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1569 return obsoletenotrebased
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1570
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1571 def summaryhook(ui, repo):
30709 a932297febb7 rebase: use repo.vfs.exists in 'hg summary' hook Valters Vingolds <valters@vingolds.ch> parents: 30674 diff changeset	1572 if not repo.vfs.exists('rebasestate'):
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1573 return
19849 e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1574 try:
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	1575 rbsrt = rebaseruntime(repo, ui, {})
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	1576 rbsrt.restorestatus()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	1577 state = rbsrt.state
19849 e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1578 except error.RepoLookupError:
e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1579 # i18n: column positioning for "hg summary"
e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1580 msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n')
e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1581 ui.write(msg)
e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1582 return
23489 fe4157d839ac rebase: use '>= 0' to know is a revision was rebased Pierre-Yves David <pierre-yves.david@fb.com> parents: 23484 diff changeset	1583 numrebased = len([i for i in state.itervalues() if i >= 0])
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1584 # i18n: column positioning for "hg summary"
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1585 ui.write(_('rebase: %s, %s (rebase --continue)\n') %
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1586 (ui.label(_('%d rebased'), 'rebase.rebased') % numrebased,
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1587 ui.label(_('%d remaining'), 'rebase.remaining') %
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1588 (len(state) - numrebased)))
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1589
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1590 def uisetup(ui):
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1591 #Replace pull with a decorator to provide --rebase option
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	1592 entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	1593 entry[1].append(('', 'rebase', None,
14444 1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1594 _("rebase working directory to branch head")))
1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1595 entry[1].append(('t', 'tool', '',
1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1596 _("specify merge tool for rebase")))
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1597 cmdutil.summaryhooks.add('rebase', summaryhook)
19478 e5a5790a3185 rebase: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19477 diff changeset	1598 cmdutil.unfinishedstates.append(
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19478 diff changeset	1599 ['rebasestate', False, False, _('rebase in progress'),
19478 e5a5790a3185 rebase: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19477 diff changeset	1600 _("use 'hg rebase --continue' or 'hg rebase --abort'")])
27626 157675d0f600 rebase: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27586 diff changeset	1601 cmdutil.afterresolvedstates.append(
157675d0f600 rebase: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27586 diff changeset	1602 ['rebasestate', _('hg rebase --continue')])
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1603 # ensure rebased rev are not hidden
32586 47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32427 diff changeset	1604 extensions.wrapfunction(repoview, 'pinnedrevs', _rebasedvisible)

Mercurial > public > mercurial-scm > hg

annotate hgext/rebase.py @ 34005:5e83a8fe6bc4