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

annotate hgext/rebase.py @ 33806:dedab036215d

wireproto: use new peer interface The wirepeer class provides concrete implementations of peer interface methods for calling wire protocol commands. It makes sense for this class to inherit from the peer abstract base class. So we change that. Since httppeer and sshpeer have already been converted to the new interface, peerrepository is no longer adding any value. So it has been removed. httppeer and sshpeer have been updated to reflect the loss of peerrepository and the inheritance of the abstract base class in wirepeer. The code changes in wirepeer are reordering of methods to group by interface. Some Python code in tests was updated to reflect changed APIs. .. api:: peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository. Differential Revision: https://phab.mercurial-scm.org/D338

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 10 Aug 2017 20:58:28 -0700
parents	19f495fef0a3
children	35fc5e919675

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 hex,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	25 nullid,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	26 nullrev,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	27 short,
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29128 diff changeset	28 )
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	29 from mercurial import (
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	30 bookmarks,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	31 cmdutil,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	32 commands,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	33 copies,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	34 destutil,
30490 ee2097c560c1 rebase: refer to dirstateguard by its new name Augie Fackler <augie@google.com> parents: 30459 diff changeset	35 dirstateguard,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	36 error,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	37 extensions,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	38 hg,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	39 lock,
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	40 merge as mergemod,
30495 d528ddc11b33 rebase: refer to checkunresolved by its new name Augie Fackler <augie@google.com> parents: 30490 diff changeset	41 mergeutil,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	42 obsolete,
33145 0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33139 diff changeset	43 obsutil,
29128 e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	44 patch,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	45 phases,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	46 registrar,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	47 repair,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	48 repoview,
e521cb13d354 py3: make hgext/rebase.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 29063 diff changeset	49 revset,
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
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10351 diff changeset	63 nullmerge = -2
18447 7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	64 revignored = -3
27013 e97132eb841c rebase: remove an unused todo Laurent Charignon <lcharignon@fb.com> parents: 27012 diff changeset	65 # successor in rebase destination
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	66 revprecursor = -4
27013 e97132eb841c rebase: remove an unused todo Laurent Charignon <lcharignon@fb.com> parents: 27012 diff changeset	67 # plain prune (no successor)
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	68 revpruned = -5
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10351 diff changeset	69
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	70 cmdtable = {}
32337 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 32327 diff changeset	71 command = registrar.command(cmdtable)
29841 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29610 diff changeset	72 # 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	73 # 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	74 # 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	75 # leave the attribute unspecified.
29841 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29610 diff changeset	76 testedwith = 'ships-with-hg-core'
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	77
26671 66dc39cd7d06 rebase: factor out nothing to rebase return code Ryan McElroy <rmcelroy@fb.com> parents: 26669 diff changeset	78 def _nothingtorebase():
66dc39cd7d06 rebase: factor out nothing to rebase return code Ryan McElroy <rmcelroy@fb.com> parents: 26669 diff changeset	79 return 1
66dc39cd7d06 rebase: factor out nothing to rebase return code Ryan McElroy <rmcelroy@fb.com> parents: 26669 diff changeset	80
27976 8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	81 def _savegraft(ctx, extra):
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	82 s = ctx.extra().get('source', None)
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	83 if s is not None:
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	84 extra['source'] = s
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	85 s = ctx.extra().get('intermediate-source', None)
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	86 if s is not None:
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	87 extra['intermediate-source'] = s
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	88
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	89 def _savebranch(ctx, extra):
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	90 extra['branch'] = ctx.branch()
8f4d3eeb5198 rebase: backout changeset d755a9531fce Siddharth Agarwal <sid0@fb.com> parents: 27975 diff changeset	91
19860 6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	92 def _makeextrafn(copiers):
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	93 """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	94
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	95 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	96 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	97 """
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	98 def extrafn(ctx, extra):
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	99 for c in copiers:
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	100 c(ctx, extra)
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	101 return extrafn
6cd9b8428104 rebase: rework extrafn handling to support multiple extrafns Augie Fackler <raf@durin42.com> parents: 19852 diff changeset	102
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	103 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	104 """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	105
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 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	107 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	108 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	109
28394 dcb4209bd30d revset: replace extpredicate by revsetpredicate of registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28280 diff changeset	110 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	111
42910f9fffeb revset: use delayregistrar to register predicate in extension easily FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27577 diff changeset	112 @revsetpredicate('_destrebase')
26719 8bed1eae99df rebase: rename and test '_destrebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26718 diff changeset	113 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	114 # ``_rebasedefaultdest()``
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	115
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	116 # default destination for rebase.
3f8c5c284c86 rebase: move destination computation in a revset Pierre-Yves David <pierre-yves.david@fb.com> parents: 26165 diff changeset	117 # # 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	118 # # 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	119 # 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	120 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	121 if x is not None:
31023 aea06029919e revset: import set classes directly from smartset module Yuya Nishihara <yuya@tcha.org> parents: 30865 diff changeset	122 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	123 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	124
29358 6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	125 class rebaseruntime(object):
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	126 """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	127 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	128 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	129 opts = {}
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	130
adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	131 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	132 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	133 self.opts = opts
29358 6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	134 self.originalwd = None
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	135 self.external = nullrev
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	136 # 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	137 # 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	138 # 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	139 self.state = {}
6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	140 self.activebookmark = None
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	141 self.dest = None
29360 4cbe62ab5c97 rebase: move local variable 'skipped' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29359 diff changeset	142 self.skipped = set()
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	143 self.destancestors = set()
29358 6e83f5bbed8d rebase: introduce a rebaseruntime (RR) class Kostia Balytskyi <ikostia@fb.com> parents: 29205 diff changeset	144
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	145 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	146 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	147 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	148
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	149 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	150 self.extrafns = [_savegraft]
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	151 if e:
87acd047711e rebase: move local variables 'date' and 'extrafns' to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29400 diff changeset	152 self.extrafns = [e]
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	153
29402 7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	154 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	155 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	156 # 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	157 # other extensions
7481ffb7ff83 rebase: move local variables related to keeping things unchanged to the RR Kostia Balytskyi <ikostia@fb.com> parents: 29401 diff changeset	158 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	159 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	160
31224 183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	161 def storestatus(self, tr=None):
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	162 """Store the current status to allow recovery"""
31224 183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	163 if tr:
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	164 tr.addfilegenerator('rebasestate', ('rebasestate',),
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	165 self._writestatus, location='plain')
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	166 else:
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	167 with self.repo.vfs("rebasestate", "w") as f:
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	168 self._writestatus(f)
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	169
183eb1d7f87d rebase: add storestatus support for transactions Durham Goode <durham@fb.com> parents: 31223 diff changeset	170 def _writestatus(self, f):
31619 91ddb33deea5 rebase: move state serialization to use unfiltered repo Durham Goode <durham@fb.com> parents: 31588 diff changeset	171 repo = self.repo.unfiltered()
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	172 f.write(repo[self.originalwd].hex() + '\n')
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	173 f.write(repo[self.dest].hex() + '\n')
31223 685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	174 f.write(repo[self.external].hex() + '\n')
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	175 f.write('%d\n' % int(self.collapsef))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	176 f.write('%d\n' % int(self.keepf))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	177 f.write('%d\n' % int(self.keepbranchesf))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	178 f.write('%s\n' % (self.activebookmark or ''))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	179 for d, v in self.state.iteritems():
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	180 oldrev = repo[d].hex()
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	181 if v >= 0:
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	182 newrev = repo[v].hex()
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	183 elif v == revtodo:
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	184 # To maintain format compatibility, we have to use nullid.
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	185 # Please do remove this special case when upgrading the format.
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	186 newrev = hex(nullid)
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	187 else:
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	188 newrev = v
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	189 f.write("%s:%s\n" % (oldrev, newrev))
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	190 repo.ui.debug('rebase status stored\n')
685b8d077577 rebase: move storestatus onto rebaseruntime Durham Goode <durham@fb.com> parents: 31222 diff changeset	191
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	192 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	193 """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	194 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	195 keepbranches = None
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	196 dest = None
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	197 collapse = False
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	198 external = nullrev
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	199 activebookmark = None
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	200 state = {}
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	201
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	202 try:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	203 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	204 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	205 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	206 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	207 elif i == 1:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	208 dest = 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	209 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	210 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	211 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	212 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	213 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	214 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	215 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	216 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	217 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	218 # 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	219 # 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	220 # 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	221 activebookmark = l
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	222 else:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	223 oldrev, newrev = l.split(':')
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	224 if newrev in (str(nullmerge), str(revignored),
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	225 str(revprecursor), str(revpruned)):
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	226 state[repo[oldrev].rev()] = int(newrev)
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	227 elif newrev == nullid:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	228 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	229 # 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	230 else:
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	231 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	232
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	233 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	234 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	235 raise
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	236 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	237
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	238 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	239 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	240
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	241 skipped = set()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	242 # 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	243 if not collapse:
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32272 diff changeset	244 seen = {dest}
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	245 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	246 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	247 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	248 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	249 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	250 (' '.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	251 repo.ui.debug('rebase status resumed\n')
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32272 diff changeset	252 _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	253
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	254 self.originalwd = originalwd
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	255 self.dest = dest
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	256 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	257 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	258 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	259 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	260 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	261 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	262 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	263
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	264 def _handleskippingobsolete(self, rebaserevs, obsoleterevs, dest):
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	265 """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	266
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	267 rebaserevs: iterable of all revisions that are to be rebased
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	268 obsoleterevs: iterable of all obsolete revisions in rebaseset
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	269 dest: a destination revision for the rebase operation
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	270 """
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	271 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	272 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	273 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	274 return
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	275 rebaseset = set(rebaserevs)
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	276 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	277 self.obsoletenotrebased = _computeobsoletenotrebased(self.repo,
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	278 obsoleteset, dest)
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	279 skippedset = set(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	280 _checkobsrebase(self.repo, self.ui, obsoleteset, rebaseset, skippedset)
5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	281
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	282 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	283 try:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	284 self.restorestatus()
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	285 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	286 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	287 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	288 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	289 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	290 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	291 ' 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	292 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	293 else:
f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	294 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	295 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	296 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	297 if isabort:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	298 return abort(self.repo, self.originalwd, self.dest,
29472 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.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	300
29479 5d16ebe7b14f rebase: move handling of obsolete commits to be a separate RR class method Kostia Balytskyi <ikostia@fb.com> parents: 29478 diff changeset	301 obsrevs = (r for r, st in self.state.items() if st == revprecursor)
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	302 self._handleskippingobsolete(self.state.keys(), obsrevs, self.dest)
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	303
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	304 def _preparenewrebase(self, dest, rebaseset):
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	305 if dest is None:
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	306 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	307
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	308 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	309 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	310 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	311 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	312 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	313 _("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	314 " 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	315 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	316
29610 754f63671229 rebase: turn rebase revs into set before filtering obsolete Simon Farnsworth <simonfar@fb.com> parents: 29552 diff changeset	317 obsrevs = _filterobsoleterevs(self.repo, set(rebaseset))
33157 5d29c55414b3 rebase: always pass destination as revnum to _handleskippingobsolete() Martin von Zweigbergk <martinvonz@google.com> parents: 33145 diff changeset	318 self._handleskippingobsolete(rebaseset, obsrevs, dest.rev())
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	319
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	320 result = buildstate(self.repo, dest, rebaseset, self.collapsef,
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	321 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	322
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	323 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	324 # 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	325 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	326 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	327
31302 681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	328 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	329 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	330 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	331 % root,
681046de87f1 rebase: abort if any commit in rebase set is public Martin von Zweigbergk <martinvonz@google.com> parents: 31297 diff changeset	332 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	333
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	334 (self.originalwd, self.dest, 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	335 if self.collapsef:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	336 self.destancestors = self.repo.changelog.ancestors(
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	337 [self.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	338 inclusive=True)
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	339 self.external = externalparent(self.repo, self.state,
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	340 self.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	341
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	342 if dest.closesbranch() and not self.keepbranchesf:
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	343 self.ui.status(_('reopening closed branch head %s\n') % dest)
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	344
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	345 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	346 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	347 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	348 # 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	349 # 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	350 # desired
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	351 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	352 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	353 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	354 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	355 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	356 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	357 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	358 'branches'))
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	359
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	360 # Rebase
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	361 if not self.destancestors:
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	362 self.destancestors = repo.changelog.ancestors([self.dest],
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	363 inclusive=True)
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
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	365 # 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	366 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	367 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	368 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	369
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	370 # 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	371 # 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	372 self.storestatus()
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	373
30007 aca0954d3739 rebase: rebase changesets in topo order (issue5370) (BC) Xidorn Quan <me@upsuper.org> parents: 29966 diff changeset	374 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	375 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	376 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	377 pos = 0
29552 db26925bdbb0 rebase: remove sortedstate-related confusion Kostia Balytskyi <ikostia@fb.com> parents: 29551 diff changeset	378 for rev in sortedrevs:
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 ctx = repo[rev]
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	380 desc = '%d:%s "%s"' % (ctx.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	381 ctx.description().split('\n', 1)[0])
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	382 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	383 if names:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	384 desc += ' (%s)' % ' '.join(names)
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	385 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	386 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	387 elif self.state[rev] == revtodo:
29872 58db005d870e rebase: properly calculate total commits to rebase (issue5347) timeless <timeless@mozdev.org> parents: 29841 diff changeset	388 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	389 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	390 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	391 _('changesets'), total)
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	392 p1, p2, base = defineparents(repo, rev, self.dest, self.state)
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	393 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	394 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	395 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	396 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	397 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	398 try:
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.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	400 'rebase')
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	401 stats = rebasenode(repo, rev, p1, base, self.state,
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	402 self.collapsef, self.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	403 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	404 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	405 _('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	406 '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	407 finally:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	408 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	409 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	410 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	411 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	412 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	413 newnode = concludenode(repo, rev, p1, p2,
29551 333dd3ab8fb2 rebase: replace extrafn field with _makeextrafn invocations Kostia Balytskyi <ikostia@fb.com> parents: 29479 diff changeset	414 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	415 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	416 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	417 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	418 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	419 # 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	420 # 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	421 # 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	422 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	423 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	424 # 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	425 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	426 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	427 # 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	428 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	429 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	430 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	431 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	432 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	433 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	434 '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	435 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	436 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	437 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	438 elif self.state[rev] == nullmerge:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	439 ui.debug('ignoring null merge rebase of %s\n' % rev)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	440 elif self.state[rev] == revignored:
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.status(_('not rebasing ignored %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	442 elif self.state[rev] == revprecursor:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	443 destctx = repo[self.obsoletenotrebased[rev]]
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	444 descdest = '%d:%s "%s"' % (destctx.rev(), destctx,
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	445 destctx.description().split('\n', 1)[0])
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	446 msg = _('note: not rebasing %s, already in destination as %s\n')
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	447 ui.status(msg % (desc, descdest))
29477 becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	448 elif self.state[rev] == revpruned:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	449 msg = _('note: not rebasing %s, it has no successor\n')
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(msg % desc)
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	451 else:
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	452 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	453 (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	454
becc4c6eca42 rebase: move core rebase logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29476 diff changeset	455 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	456 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	457
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	458 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	459 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	460 if self.collapsef and not self.keepopen:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	461 p1, p2, _base = defineparents(repo, min(self.state),
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	462 self.dest, 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	463 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	464 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	465 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	466 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	467 else:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	468 commitmsg = 'Collapsed revision'
33622 5a5f600b06ad rebase: sort collapsed revisions in commit message (issue5643) Yuya Nishihara <yuya@tcha.org> parents: 33590 diff changeset	469 for rebased in sorted(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	470 if rebased not in self.skipped and\
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	471 self.state[rebased] > nullmerge:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	472 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	473 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	474 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
29552 db26925bdbb0 rebase: remove sortedstate-related confusion Kostia Balytskyi <ikostia@fb.com> parents: 29551 diff changeset	475 revtoreuse = max(self.state)
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	476
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	477 dsguard = None
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	478 if ui.configbool('rebase', 'singletransaction'):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	479 dsguard = dirstateguard.dirstateguard(repo, 'rebase')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	480 with util.acceptintervention(dsguard):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	481 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	482 commitmsg=commitmsg,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	483 extrafn=_makeextrafn(self.extrafns),
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	484 editor=editor,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	485 keepbranches=self.keepbranchesf,
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	486 date=self.date)
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	487 if newnode is None:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	488 newrev = self.dest
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	489 else:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	490 newrev = repo[newnode].rev()
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	491 for oldrev in self.state.iterkeys():
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	492 if self.state[oldrev] > nullmerge:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	493 self.state[oldrev] = newrev
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	494
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	495 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	496 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	497
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	498 # 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	499 # (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	500 newwd = self.state.get(self.originalwd, 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	501 if newwd == revprecursor:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	502 newwd = self.obsoletenotrebased[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	503 elif newwd < 0:
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	504 # 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	505 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	506 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	507 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	508 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	509
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	510 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	511 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	512 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	513 collapsedas = newnode
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	514 clearrebased(ui, repo, self.dest, self.state, self.skipped,
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	515 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	516
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	517 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	518 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	519
007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	520 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	521 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	522 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	523 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	524 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	525
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	526 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	527 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	528 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	529
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	530 @command('rebase',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	531 [('s', 'source', '',
22789 5f4934487382 rebase: attempt to clarify --base Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	532 _('rebase the specified changeset and descendants'), _('REV')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	533 ('b', 'base', '',
22789 5f4934487382 rebase: attempt to clarify --base Matt Mackall <mpm@selenic.com> parents: 22405 diff changeset	534 _('rebase everything from branching point of specified changeset'),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	535 _('REV')),
15270 6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	536 ('r', 'rev', [],
6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	537 _('rebase these revisions'),
6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15269 diff changeset	538 _('REV')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	539 ('d', 'dest', '',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	540 _('rebase onto the specified changeset'), _('REV')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	541 ('', 'collapse', False, _('collapse the rebased changesets')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	542 ('m', 'message', '',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	543 _('use text as collapse commit message'), _('TEXT')),
15219 9d58569a8b92 rebase: add --edit switch Matt Mackall <mpm@selenic.com> parents: 15214 diff changeset	544 ('e', 'edit', False, _('invoke editor on commit messages')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	545 ('l', 'logfile', '',
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	546 _('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	547 ('k', 'keep', False, _('keep original changesets')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	548 ('', '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	549 ('D', 'detach', False, _('(DEPRECATED)')),
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	550 ('i', 'interactive', False, _('(DEPRECATED)')),
14306 db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	551 ('t', 'tool', '', _('specify merge tool')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	552 ('c', 'continue', False, _('continue an interrupted rebase')),
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	553 ('a', 'abort', False, _('abort an interrupted rebase'))] +
db2a8eabe952 rebase: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 14289 diff changeset	554 templateopts,
17325 e4db509c08ec rebase: remove second broken synopsis line (issue3172) Patrick Mezard <patrick@mezard.eu> parents: 17059 diff changeset	555 _('[-s REV \| -b REV] [-d REV] [OPTION]'))
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	556 def rebase(ui, repo, **opts):
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	557 """move changeset (and descendants) to a different branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	558
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7955 diff changeset	559 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	560 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	561 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	562 development tree.
86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	563
27454 3e3be524a712 rebase: simplify documentation about public commits timeless <timeless@mozdev.org> parents: 27344 diff changeset	564 Published commits cannot be rebased (see :hg:`help phases`).
3e3be524a712 rebase: simplify documentation about public commits timeless <timeless@mozdev.org> parents: 27344 diff changeset	565 To copy commits, see :hg:`help graft`.
18516 9fbeb61b8ad2 rebase: mention phases in the help Kevin Bullock <kbullock@ringworld.org> parents: 18514 diff changeset	566
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	567 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	568 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	569 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	570 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	571 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	572 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	573 descendants.)
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	574
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	575 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	576
a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	577 1. Explicitly select them using ``--rev``.
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	578
27455 a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	579 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	580 descendants.
27455 a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	581
a9a047878e14 rebase: simplify documentation about selecting commits to rebase timeless <timeless@mozdev.org> parents: 27454 diff changeset	582 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	583 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	584
27932 6bc2299cc12f rebase: restore help for rebase w/o args (issue5059) timeless <timeless@mozdev.org> parents: 27866 diff changeset	585 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	586 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	587
27456 2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	588 Rebase will destroy original changesets unless you use ``--keep``.
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	589 It will also move your bookmarks (even if you do).
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	590
2337958596e3 rebase: simplify documentation about --keep timeless <timeless@mozdev.org> parents: 27455 diff changeset	591 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	592 (e.g. merges from the destination branch).
10646 86dc21148bdb rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10436 diff changeset	593
27457 97cc045f1cfe rebase: simplify documentation about heads timeless <timeless@mozdev.org> parents: 27456 diff changeset	594 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	595 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	596 and/or destination.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	597
28001 ade12bf2bf0e rebase: mention help merge-tools in help timeless <timeless@mozdev.org> parents: 27977 diff changeset	598 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	599 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	600 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	601 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	602
27458 d39e743e3578 rebase: mention conflict in documentation instead of merge timeless <timeless@mozdev.org> parents: 27457 diff changeset	603 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	604 continued with --continue/-c or aborted with --abort/-a.
11205 d26f662bfbf5 rebase: add error codes Matt Mackall <mpm@selenic.com> parents: 11204 diff changeset	605
22790 c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	606 .. container:: verbose
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	607
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	608 Examples:
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	609
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	610 - move "local changes" (current commit back to branching point)
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	611 to the current branch tip after a pull::
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
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 - move a single changeset to the stable branch::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	616
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	617 hg rebase -r 5f493448 -d stable
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	618
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	619 - 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	620
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	621 hg rebase --source c0c3 --dest 4cf9
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	622
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	623 - 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	624 default branch::
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 --base myfeature --dest default
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	627
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	628 - collapse a sequence of changes into a single commit::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	629
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	630 hg rebase --collapse -r 1520:1525 -d .
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	631
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	632 - move a named branch while preserving its name::
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	633
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	634 hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	635
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	636 Configuration Options:
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	637
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	638 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	639 option::
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	640
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	641 [commands]
32083 1c911adebf48 rebase: fix incorrect configuration example FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31733 diff changeset	642 rebase.requiredest = True
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	643
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	644 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	645 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	646 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	647 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	648 unexpectedly::
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	649
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	650 [rebase]
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	651 singletransaction = True
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	652
31558 13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	653 Return Values:
13dc00c233b7 rebase: add flag to require destination Ryan McElroy <rmcelroy@fb.com> parents: 31514 diff changeset	654
19971 2a9bb64faa0b rebase: add description about exit code when there are unresolved conflicts FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19969 diff changeset	655 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	656 unresolved conflicts.
22790 c64f9e0beead rebase: add help examples Matt Mackall <mpm@selenic.com> parents: 22789 diff changeset	657
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	658 """
29399 adb0d58b8b0b rebase: pass repo, ui and opts objects to the RR class constructor Kostia Balytskyi <ikostia@fb.com> parents: 29372 diff changeset	659 rbsrt = rebaseruntime(repo, ui, opts)
15219 9d58569a8b92 rebase: add --edit switch Matt Mackall <mpm@selenic.com> parents: 15214 diff changeset	660
32917 070920db8b87 rebase: use context manager for locking in rebase() Martin von Zweigbergk <martinvonz@google.com> parents: 32900 diff changeset	661 with repo.wlock(), repo.lock():
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	662 # Validate input and define rebasing points
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	663 destf = opts.get('dest', None)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	664 srcf = opts.get('source', None)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	665 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	666 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	667 # 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	668 # 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	669 destspace = opts.get('_destspace')
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	670 contf = opts.get('continue')
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	671 abortf = opts.get('abort')
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	672 if opts.get('interactive'):
26496 b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	673 try:
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	674 if extensions.find('histedit'):
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	675 enablehistedit = ''
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	676 except KeyError:
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	677 enablehistedit = " --config extensions.histedit="
b885ab9ca182 rebase: enable histedit for useful help with it timeless@mozdev.org parents: 26495 diff changeset	678 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	679 msg = _("interactive history editing is supported by the "
26494 832f40d2af53 rebase: factor out histedit help command timeless@mozdev.org parents: 26421 diff changeset	680 "'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	681 raise error.Abort(msg)
22382 d5b04ee8ecf7 rebase: add a deprecated -i/--interactive flag David Soria Parra <davidsp@fb.com> parents: 22251 diff changeset	682
29400 c79da70a4659 rebase: move collapse-related local variables to the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29399 diff changeset	683 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	684 raise error.Abort(
13661 ee349e228835 rebase: add -m/--message to rebase --collapse (issue2389) Radomir Dopieralski <sheep@stxnext.pl> parents: 13609 diff changeset	685 _('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	686
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	687 if contf or abortf:
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	688 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	689 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	690 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	691 raise error.Abort(
11285 f118029e534c rebase: use usual util.abort rather than error.ParseError Matt Mackall <mpm@selenic.com> parents: 11205 diff changeset	692 _('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	693 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	694 raise error.Abort(
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	695 _('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	696 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	697 ui.warn(_('tool option will be ignored\n'))
30273 86f4ef63d507 rebase: check for conflicts before continuing timeless <timeless@mozdev.org> parents: 30271 diff changeset	698 if contf:
86f4ef63d507 rebase: check for conflicts before continuing timeless <timeless@mozdev.org> parents: 30271 diff changeset	699 ms = mergemod.mergestate.read(repo)
30495 d528ddc11b33 rebase: refer to checkunresolved by its new name Augie Fackler <augie@google.com> parents: 30490 diff changeset	700 mergeutil.checkunresolved(ms)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	701
29472 f585ce6878e3 rebase: move abort/continue prep to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29404 diff changeset	702 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	703 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	704 return retcode
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	705 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	706 dest, rebaseset = _definesets(ui, repo, destf, srcf, basef, revf,
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	707 destspace=destspace)
29473 e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	708 retcode = rbsrt._preparenewrebase(dest, rebaseset)
e25da98052a4 rebase: move new rebase preparation to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29472 diff changeset	709 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	710 return retcode
21027 25ee5dbebc6b rebase: tell when reopening a closed branch head Mads Kiilerich <madski@unity3d.com> parents: 20790 diff changeset	711
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	712 tr = None
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	713 dsguard = None
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	714
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	715 singletr = ui.configbool('rebase', 'singletransaction')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	716 if singletr:
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	717 tr = repo.transaction('rebase')
d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	718 with util.acceptintervention(tr):
33619 609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	719 if singletr:
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	720 dsguard = dirstateguard.dirstateguard(repo, 'rebase')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	721 with util.acceptintervention(dsguard):
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	722 rbsrt._performrebase(tr)
33569 d341677d667d rebase: add config to move rebase into a single transaction Durham Goode <durham@fb.com> parents: 33333 diff changeset	723
29478 007da66960a8 rebase: move rebase finish logic to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29477 diff changeset	724 rbsrt._finishrebase()
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	725
31395 361bccce566a rebase: don't use mutable default argument value Gregory Szorc <gregory.szorc@gmail.com> parents: 31380 diff changeset	726 def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=None,
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	727 destspace=None):
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	728 """use revisions argument to define destination and rebase set
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	729 """
31431 406705701c2d rebase: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31395 diff changeset	730 if revf is None:
406705701c2d rebase: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31395 diff changeset	731 revf = []
31395 361bccce566a rebase: don't use mutable default argument value Gregory Szorc <gregory.szorc@gmail.com> parents: 31380 diff changeset	732
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	733 # 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	734 # 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	735 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	736 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	737 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	738 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	739 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	740 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	741
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	742 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	743 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	744
31731 b5afec71c1f9 rebase: allow destination-free continue and abort (issue5513) Ryan McElroy <rmcelroy@fb.com> parents: 31621 diff changeset	745 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	746 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	747 hint=_('use: hg rebase -d REV'))
b5afec71c1f9 rebase: allow destination-free continue and abort (issue5513) Ryan McElroy <rmcelroy@fb.com> parents: 31621 diff changeset	748
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	749 if destf:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	750 dest = scmutil.revsingle(repo, destf)
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	751
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	752 if revf:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	753 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	754 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	755 ui.status(_('empty "rev" revision set - nothing to rebase\n'))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	756 return None, None
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	757 elif srcf:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	758 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	759 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	760 ui.status(_('empty "source" revision set - nothing to rebase\n'))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	761 return None, None
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	762 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	763 assert rebaseset
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	764 else:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	765 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	766 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	767 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	768 "can't compute rebase set\n"))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	769 return None, 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	770 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	771 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	772 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	773
30580 51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	774 roots = [] # selected children of branching points
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	775 bpbase = {} # {branchingpoint: [origbase]}
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	776 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	777 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	778 bpbase[bp] = bpbase.get(bp, []) + [b]
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	779 if None in bpbase:
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	780 # 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	781 # 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	782 bpbase.clear()
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	783 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	784 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	785
51e7c83e05ee rebase: calculate ancestors for --base separately (issue5420) Jun Wu <quark@fb.com> parents: 30495 diff changeset	786 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	787
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	788 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	789 # 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	790 # 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	791 # smartset.
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	792 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	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 - %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	795 ' 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	796 else:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	797 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	798 '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	799 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	800 if basef:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	801 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	802 '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	803 '%s\n') %
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	804 ('+'.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	805 dest))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	806 else:
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	807 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	808 '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	809 '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	810 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	811 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	812 ('+'.join(str(repo[r]) for r in base), dest))
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	813 return None, 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	814
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28188 diff changeset	815 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	816 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	817 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	818
28136 5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	819 return dest, rebaseset
5853878bbc2a rebase: extract rebaseset and destination computation in a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 28122 diff changeset	820
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	821 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	822 """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	823 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	824 Abort if there is more than one parent.
10351 38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	825 """
19955 2160c2e0d7d1 rebase: refactor and rename checkexternal - it is a getter more than a setter Mads Kiilerich <madski@unity3d.com> parents: 19951 diff changeset	826 parents = set()
10351 38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	827 source = min(state)
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	828 for rev in state:
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	829 if rev == source:
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	830 continue
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	831 for p in repo[rev].parents():
38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	832 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	833 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	834 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	835 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	836 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	837 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	838 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	839 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	840 '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	841 (max(destancestors),
19956 78ab0f85e249 rebase: improve error message for more than one external parent Mads Kiilerich <madski@unity3d.com> parents: 19955 diff changeset	842 ', '.join(str(p) for p in sorted(parents))))
10351 38fe86fb16e3 rebase: refactoring Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 10263 diff changeset	843
26360 b2415e94b2f5 rebase: avoid losing branch commits with --keepbranch (issue4835) timeless@mozdev.org parents: 26349 diff changeset	844 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	845 keepbranches=False, date=None):
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	846 '''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	847 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	848 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	849 dsguard = util.nullcontextmanager()
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	850 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	851 dsguard = dirstateguard.dirstateguard(repo, 'rebase')
609606d21765 rebase: use one dirstateguard for when using rebase.singletransaction Durham Goode <durham@fb.com> parents: 33590 diff changeset	852 with dsguard:
33120 b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	853 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	854 ctx = repo[rev]
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	855 if commitmsg is None:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	856 commitmsg = ctx.description()
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	857 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	858 extra = {'rebase_source': ctx.hex()}
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	859 if extrafn:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	860 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	861
33139 40ee74bfa111 merge with stable Martin von Zweigbergk <martinvonz@google.com> parents: 33056 33121 diff changeset	862 destphase = max(ctx.phase(), phases.draft)
40ee74bfa111 merge with stable Martin von Zweigbergk <martinvonz@google.com> parents: 33056 33121 diff changeset	863 overrides = {('phases', 'new-commit'): destphase}
33120 b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	864 with repo.ui.configoverride(overrides, 'rebase'):
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	865 if keepbranch:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	866 repo.ui.setconfig('ui', 'allowemptycommit', True)
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	867 # 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	868 if date is None:
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	869 date = ctx.date()
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	870 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	871 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	872
33120 b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	873 repo.dirstate.setbranch(repo[newnode].branch())
b63351f6a246 rebase: backed out changeset 2519994d25ca Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32084 diff changeset	874 return newnode
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	875
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	876 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	877 '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	878 # Merge phase
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	879 # 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	880 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	881 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	882 mergemod.update(repo, p1, False, True)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	883 else:
32249 27e67cfea27f rebase: rename "target" to "destination" in messages Martin von Zweigbergk <martinvonz@google.com> parents: 32248 diff changeset	884 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	885 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	886 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	887 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	888 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	889 # 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	890 # have to allow merging with it.
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	891 stats = mergemod.update(repo, rev, True, True, base, collapse,
0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	892 labels=['dest', 'source'])
22905 63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	893 if collapse:
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	894 copies.duplicatecopies(repo, rev, dest)
22905 63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	895 else:
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	896 # 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	897 # duplicate copies between the revision we're
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	898 # rebasing and its first parent, but not
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	899 # duplicate any copies that have already been
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	900 # performed in the destination.
63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	901 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	902 copies.duplicatecopies(repo, rev, p1rev, skiprev=dest)
22905 63e889cc610d rebase: move duplicatecopies next to merge Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	903 return stats
6923 ebf1462f2145 strip trailing whitespace, replace tabs by spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6906 diff changeset	904
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	905 def adjustdest(repo, rev, dest, state):
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	906 """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	907
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	908 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	909 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	910 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	911
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	912 For example, when doing rebase -r B+E -d F, rebase will first move B to B1,
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	913 and E's destination will be adjusted from F to B1.
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	914
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	915 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	916 \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	917 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	918 \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	919 \| 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	920 \| \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	921 \| 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	922 \| \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	923 \| 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	924 \| \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	925 \| C
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	926 \| \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	927 \| B <- rebased as B1
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	928 \|/
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	929 A
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	930
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	931 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	932 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	933 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	934
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	935 H C1 G1
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	936 /\| \| /
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	937 F G \|/
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	938 K \| \| -> K
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	939 \| C D \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	940 \| \|/ \|
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	941 \| B \| ...
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 A A
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 result = []
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	946 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	947 adjusted = dest
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	948 if prev != nullrev:
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	949 # pick already rebased revs from state
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	950 source = [s for s, d in state.items() if d > 0]
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	951 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	952 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	953 adjusted = state[candidate]
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	954 result.append(adjusted)
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	955 return result
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	956
30674 eb69f78c48ab rebase: un-wrap function signature since it fits in 80 columns Augie Fackler <raf@durin42.com> parents: 30580 diff changeset	957 def _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs, rebaseobsskipped):
28685 6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	958 """
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	959 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	960
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	961 `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	962 `rebasesetrevs`: set of revisions to be rebased from source
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	963 `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	964 successors in destination
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	965 """
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	966 # 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	967 divergenceok = ui.configbool('experimental',
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	968 'allowdivergence')
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	969 divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	970
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	971 if divergencebasecandidates and not divergenceok:
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	972 divhashes = (str(repo[r])
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	973 for r in divergencebasecandidates)
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	974 msg = _("this rebase will cause "
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	975 "divergences from: %s")
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	976 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	977 "experimental.allowdivergence=True")
6c4d23fe611c rebase: refactor of error handling code path for rebaseskipobsolete Laurent Charignon <lcharignon@fb.com> parents: 28429 diff changeset	978 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	979
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	980 def successorrevs(repo, rev):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	981 """yield revision numbers for successors of rev"""
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	982 unfi = repo.unfiltered()
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	983 nodemap = unfi.changelog.nodemap
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	984 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	985 if s in nodemap:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	986 yield nodemap[s]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	987
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	988 def defineparents(repo, rev, dest, state):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	989 """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	990
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	991 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	992 previously rebase result could affect destination. For example,
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	993
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	994 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	995 \|/ C will be rebased to C'
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	996 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	997 \|/ 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	998 A
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	999
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1000 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	1001 block below.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1002 """
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1003 cl = repo.changelog
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1004 def isancestor(a, b):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1005 # take revision numbers instead of nodes
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1006 if a == b:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1007 return True
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1008 elif a > b:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1009 return False
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1010 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	1011
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1012 oldps = repo.changelog.parentrevs(rev) # old parents
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1013 newps = [nullrev, nullrev] # new parents
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1014 dests = adjustdest(repo, rev, dest, state) # adjusted destinations
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1015 bases = list(oldps) # merge base candidates, initially just old parents
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1016
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1017 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	1018 # 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	1019 newps[0] = dests[0]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1020 else:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1021 # 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	1022 # 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	1023 # 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	1024 # accepts one dest per src.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1025 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1026 # 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	1027 # 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	1028 # 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	1029 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1030 # 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	1031 # 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	1032 # 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	1033 # because it was rebased?
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1034 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1035 # For example:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1036 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1037 # 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	1038 # /\| # 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	1039 # 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	1040 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1041 # 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	1042 # at most 2 parents.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1043 for i, p in enumerate(oldps):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1044 np = p # new parent
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1045 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	1046 np = dests[i]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1047 elif p in state and state[p] > 0:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1048 np = state[p]
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	1049
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1050 # "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	1051 # 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	1052 # For example:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1053 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1054 # 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	1055 # \| 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	1056 # 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	1057 # \| 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	1058 # \|/ # 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	1059 # A # the merged graph.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1060 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1061 # 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	1062 # 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	1063 if isancestor(p, np):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1064 bases[i] = nullrev
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1065
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1066 # 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	1067 for j, x in enumerate(newps[:i]):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1068 if x == nullrev:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1069 continue
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1070 if isancestor(np, x):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1071 np = nullrev
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1072 elif isancestor(x, np):
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1073 newps[j] = np
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1074 np = nullrev
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1075 bases[j], bases[i] = bases[i], bases[j]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1076
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1077 newps[i] = np
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1078
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1079 # "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	1080 # 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	1081 # 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	1082 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	1083 assert len(newps) == 2 and len(oldps) == 2
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1084 newps.reverse()
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1085 bases.reverse()
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1086
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1087 # 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	1088 # 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	1089 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1090 # C # rebase -r C -d D
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1091 # /\| # 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	1092 # A B D
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1093 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	1094 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	1095 '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	1096 % (rev, repo[rev]))
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1097
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1098 repo.ui.debug(" future parents are %d and %d\n" % tuple(newps))
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1099
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1100 # "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	1101 if bases[0] != nullrev:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1102 base = bases[0]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1103 else:
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	1104 base = None
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1105
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1106 # 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	1107 # 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	1108 # 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	1109 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1110 # F
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 # 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	1113 # \| \| # 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	1114 # 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	1115 # \|/ # chosen, the rebased F will contain B.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1116 # A Z
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1117 #
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1118 # 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	1119 # 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	1120 # pick one (so choose p1 above).
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1121 if sum(1 for b in bases if b != nullrev) > 1:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1122 assert base is not None
23484 cf3495dfd7ed rebase: move base calculation from rebasenode() to defineparents() Mads Kiilerich <madski@unity3d.com> parents: 23461 diff changeset	1123
33786 0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1124 # Revisions in the side (not chosen as merge base) branch that might
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1125 # contain "surprising" contents
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1126 siderevs = list(repo.revs('((%ld-%d) %% (%d+%d))',
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1127 bases, base, base, dest))
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1128
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1129 # If those revisions are covered by rebaseset, the result is good.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1130 # A merge in rebaseset would be considered to cover its ancestors.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1131 if siderevs:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1132 rebaseset = [r for r, d in state.items() if d > 0]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1133 merges = [r for r in rebaseset if cl.parentrevs(r)[1] != nullrev]
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1134 unwantedrevs = list(repo.revs('%ld - (::%ld) - %ld',
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1135 siderevs, merges, rebaseset))
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 # For revs not covered, it is worth a warning.
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1138 if unwantedrevs:
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1139 repo.ui.warn(
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1140 _('warning: rebasing %d:%s may include unwanted changes '
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1141 'from %s\n')
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1142 % (rev, repo[rev], ', '.join('%d:%s' % (r, repo[r])
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1143 for r in unwantedrevs)))
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1144
0975506120fb rebase: rewrite core algorithm (issue5578) (issue5630) Jun Wu <quark@fb.com> parents: 33736 diff changeset	1145 return newps[0], newps[1], base
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1146
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1147 def isagitpatch(repo, patchname):
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1148 '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	1149 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	1150 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	1151 if line.startswith('diff --git'):
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1152 return True
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1153 return False
c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 7954 diff changeset	1154
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1155 def updatemq(repo, state, skipped, **opts):
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1156 'Update rebased mq patches - finalize and then import them'
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1157 mqrebase = {}
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1158 mq = repo.mq
14572 8ff2957c1d82 mq: rename full_series to fullseries Adrian Buehlmann <adrian@cadifra.com> parents: 14509 diff changeset	1159 original_series = mq.fullseries[:]
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1160 skippedpatches = set()
14497 ea585f2b1adc rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 13894 diff changeset	1161
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1162 for p in mq.applied:
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1163 rev = repo[p.node].rev()
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1164 if rev in state:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9301 diff changeset	1165 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	1166 (rev, p.name))
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1167 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	1168 else:
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1169 # 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	1170 skippedpatches.add(p.name)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1171
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1172 if mqrebase:
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1173 mq.finish(repo, mqrebase.keys())
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1174
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1175 # 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	1176 for rev in sorted(mqrebase, reverse=True):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1177 if rev not in skipped:
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1178 name, isgit = mqrebase[rev]
23520 de143427c499 rebase: show a note for updated mq patches Mads Kiilerich <mads@kiilerich.com> parents: 23519 diff changeset	1179 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	1180 (name, state[rev], repo[state[rev]]))
11537 0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1181 mq.qimport(repo, (), patchname=name, git=isgit,
0a044e5ff489 rebase: small cosmetic cleanups Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11531 diff changeset	1182 rev=[str(state[rev])])
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1183 else:
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1184 # Rebased and skipped
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1185 skippedpatches.add(mqrebase[rev][0])
14497 ea585f2b1adc rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 13894 diff changeset	1186
16531 b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1187 # 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	1188 # 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	1189 # 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	1190 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	1191 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	1192 mq.fullseries[:] = newseries
b9f51f49bf2a rebase: preserve mq series order, guarded patches (issue2849) Patrick Mezard <patrick@mezard.eu> parents: 16280 diff changeset	1193 mq.seriesdirty = True
14580 92101ea35015 mq: rename save_dirty to savedirty Adrian Buehlmann <adrian@cadifra.com> parents: 14572 diff changeset	1194 mq.savedirty()
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1195
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1196 def storecollapsemsg(repo, collapsemsg):
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1197 'Store the collapse message to allow recovery'
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1198 collapsemsg = collapsemsg or ''
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1199 f = repo.vfs("last-message.txt", "w")
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1200 f.write("%s\n" % collapsemsg)
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1201 f.close()
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1202
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1203 def clearcollapsemsg(repo):
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1204 'Remove collapse message file'
31311 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31302 diff changeset	1205 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	1206
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1207 def restorecollapsemsg(repo, isabort):
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1208 'Restore previously stored collapse message'
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1209 try:
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1210 f = repo.vfs("last-message.txt")
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1211 collapsemsg = f.readline().strip()
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1212 f.close()
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1213 except IOError as err:
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1214 if err.errno != errno.ENOENT:
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1215 raise
31225 749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1216 if isabort:
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1217 # 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	1218 collapsemsg = ''
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1219 else:
749b057b01f3 rebase: allow aborting if last-message.txt is missing Durham Goode <durham@fb.com> parents: 31224 diff changeset	1220 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	1221 return collapsemsg
c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1222
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1223 def clearstatus(repo):
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1224 '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	1225 _clearrebasesetvisibiliy(repo)
33056 2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1226 # 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	1227 tr = repo.currenttransaction()
2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1228 if tr:
2312e70cf78b rebase: clean up rebasestate from active transaction Jun Wu <quark@fb.com> parents: 32918 diff changeset	1229 tr.removefilegenerator('rebasestate')
31311 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31302 diff changeset	1230 repo.vfs.unlinkpath("rebasestate", ignoremissing=True)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1231
25070 bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1232 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	1233 '''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	1234 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	1235 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	1236
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1237 # 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	1238 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	1239 return False
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1240
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1241 # 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	1242 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	1243 if new == nullrev])
bd98d073a34f rebase: clear merge when aborting before any rebasing (issue4661) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24870 diff changeset	1244 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	1245 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	1246
fe78eb7bcca0 rebase: don't clobber wd on --abort when we've updated away (issue4009) Matt Mackall <mpm@selenic.com> parents: 19496 diff changeset	1247 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	1248
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	1249 def abort(repo, originalwd, dest, state, activebookmark=None):
24758 d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1250 '''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	1251
d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1252 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	1253 restore'''
26677 e9b3d523f2e6 rebase: properly abort when destination is public (issue4896) Christian Delahousse <cdelahousse@fb.com> parents: 26675 diff changeset	1254
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1255 try:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1256 # 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	1257 # 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	1258 # dstates list must must not contain the dest rev (issue4896)
b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	1259 dstates = [s for s in state.values() if s >= 0 and s != dest]
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1260 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	1261 cleanup = True
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1262 if immutable:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1263 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	1264 % ', '.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	1265 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	1266 cleanup = False
16280 0806823370d8 rebase: properly calculate descendant set when aborting (issue3332) Matt Mackall <mpm@selenic.com> parents: 16228 diff changeset	1267
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1268 descendants = set()
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1269 if dstates:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1270 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	1271 if descendants - set(dstates):
32249 27e67cfea27f rebase: rename "target" to "destination" in messages Martin von Zweigbergk <martinvonz@google.com> parents: 32248 diff changeset	1272 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	1273 "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	1274 cleanup = False
19518 12843143663d rebase: allow aborting when descendants detected Matt Mackall <mpm@selenic.com> parents: 19517 diff changeset	1275
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1276 if cleanup:
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1277 shouldupdate = False
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	1278 rebased = filter(lambda x: x >= 0 and x != dest, state.values())
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1279 if rebased:
61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1280 strippoints = [
61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1281 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	1282
56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1283 updateifonnodes = set(rebased)
32248 b47e6b0ba6ca rebase: rename "target" to "dest" in variable names Martin von Zweigbergk <martinvonz@google.com> parents: 32175 diff changeset	1284 updateifonnodes.add(dest)
31222 56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1285 updateifonnodes.add(originalwd)
56d3e0b499df rebase: clear updatestate during rebase --abort in more cases Durham Goode <durham@fb.com> parents: 31023 diff changeset	1286 shouldupdate = repo['.'].rev() in updateifonnodes
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1287
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1288 # Update away from the rebase if necessary
27988 61f4d59e9a0b rebase: update working directory when aborting (issue5084) timeless <timeless@mozdev.org> parents: 27977 diff changeset	1289 if shouldupdate or needupdate(repo, state):
30271 0fa1a41d04e4 rebase: rename merge to mergemod timeless <timeless@mozdev.org> parents: 30007 diff changeset	1290 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	1291
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1292 # 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	1293 if rebased:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1294 # 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	1295 repair.strip(repo.ui, repo, strippoints)
19518 12843143663d rebase: allow aborting when descendants detected Matt Mackall <mpm@selenic.com> parents: 19517 diff changeset	1296
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1297 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	1298 bookmarks.activate(repo, activebookmark)
24758 d7451adc72f6 rebase: restore bookmark state on abort Tony Tung <tonytung@fb.com> parents: 23970 diff changeset	1299
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1300 finally:
21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1301 clearstatus(repo)
28185 c7e8948627f3 rebase: adds storing collapse message (issue4792) liscju <piotr.listkiewicz@gmail.com> parents: 28136 diff changeset	1302 clearcollapsemsg(repo)
26744 21e50e36de02 rebase: on abort delete rebase state file no matter what Christian Delahousse <cdelahousse@fb.com> parents: 26719 diff changeset	1303 repo.ui.warn(_('rebase aborted\n'))
19518 12843143663d rebase: allow aborting when descendants detected Matt Mackall <mpm@selenic.com> parents: 19517 diff changeset	1304 return 0
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1305
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1306 def buildstate(repo, dest, rebaseset, 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	1307 '''Define which revisions are going to be rebased and where
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1308
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	1309 repo: repo
3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15219 diff changeset	1310 dest: context
3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15219 diff changeset	1311 rebaseset: set of rev
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	1312 '''
31297 f5c71e98f0f7 rebase: unhide original working directory node as well (issue5219) Martin von Zweigbergk <martinvonz@google.com> parents: 31296 diff changeset	1313 originalwd = repo['.'].rev()
32291 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32272 diff changeset	1314 _setrebasesetvisibility(repo, set(rebaseset) \| {originalwd})
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1315
10672 c2e1e637d4da rebase: always check if rebasing onto an applied mq patch. Greg Ward <greg-hg@gerg.ca> parents: 10659 diff changeset	1316 # 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	1317 # 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	1318 # a partially completed rebase is blocked by mq.
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	1319 if 'qtip' in repo.tags() and (dest.node() in
10678 da2a0c9c895d mq: avoid many hex/bin conversions, keep the binary node when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10677 diff changeset	1320 [s.node for s in repo.mq.applied]):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26496 diff changeset	1321 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	1322
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	1323 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	1324 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	1325 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	1326 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	1327 state = dict.fromkeys(rebaseset, revtodo)
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1328 detachset = set()
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1329 emptyrebase = True
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1330 for root in roots:
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1331 commonbase = root.ancestor(dest)
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1332 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	1333 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	1334 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	1335 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	1336 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	1337 # 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	1338 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	1339 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	1340 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	1341 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	1342 # 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	1343 # 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	1344 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	1345 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	1346 continue
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1347
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1348 emptyrebase = False
29936 3e7ded768556 rebase: make debug logging more consistent Martin von Zweigbergk <martinvonz@google.com> parents: 29872 diff changeset	1349 repo.ui.debug('rebase onto %s starting from %s\n' % (dest, root))
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1350 # Rebase tries to turn <dest> into a parent of <root> while
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1351 # preserving the number of parents of rebased changesets:
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1352 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1353 # - A changeset with a single parent will always be rebased as a
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1354 # changeset with a single parent.
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1355 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1356 # - A merge will be rebased as merge unless its parents are both
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1357 # ancestors of <dest> or are themselves in the rebased set and
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1358 # pruned while rebased.
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1359 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1360 # If one parent of <root> is an ancestor of <dest>, the rebased
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1361 # version of this parent will be <dest>. This is always true with
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1362 # --base option.
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1363 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1364 # Otherwise, we need to replace the original parents with
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1365 # <dest>. This "detaches" the rebased set from its former location
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1366 # and rebases it onto <dest>. Changes introduced by ancestors of
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1367 # <root> not common with <dest> (the detachset, marked as
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1368 # nullmerge) are "removed" from the rebased changesets.
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1369 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1370 # - If <root> has a single parent, set it to <dest>.
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1371 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1372 # - If <root> is a merge, we cannot decide which parent to
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1373 # replace, the rebase operation is not clearly defined.
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1374 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1375 # The table below sums up this behavior:
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1376 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1377 # +------------------+----------------------+-------------------------+
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1378 # \| \| one parent \| merge \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1379 # +------------------+----------------------+-------------------------+
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1380 # \| parent in \| new parent is <dest> \| parents in ::<dest> are \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1381 # \| ::<dest> \| \| remapped to <dest> \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1382 # +------------------+----------------------+-------------------------+
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1383 # \| unrelated source \| new parent is <dest> \| ambiguous, abort \|
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1384 # +------------------+----------------------+-------------------------+
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1385 #
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1386 # The actual abort is handled by `defineparents`
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1387 if len(root.parents()) <= 1:
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1388 # ancestors of <root> not ancestors of <dest>
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1389 detachset.update(repo.changelog.findmissingrevs([commonbase.rev()],
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1390 [root.rev()]))
32272 78496ac30025 rebase: allow rebase even if some revisions need no rebase (BC) (issue5422) Martin von Zweigbergk <martinvonz@google.com> parents: 32249 diff changeset	1391 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	1392 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	1393 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	1394 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	1395 # 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	1396 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	1397 state[rev] = rev
18424 100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1398 for r in detachset:
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1399 if r not in state:
100fdc84670f rebase: support multiple roots for rebaseset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18386 diff changeset	1400 state[r] = nullmerge
18447 7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1401 if len(roots) > 1:
7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1402 # If we have multiple roots, we may have "hole" in the rebase set.
7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1403 # Rebase roots that descend from those "hole" should not be detached as
7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1404 # other root are. We use the special `revignored` to inform rebase that
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18549 diff changeset	1405 # the revision should be ignored but that `defineparents` should search
3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18549 diff changeset	1406 # a rebase destination that make sense regarding rebased topology.
18447 7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1407 rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset))
7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1408 for ignored in set(rebasedomain) - set(rebaseset):
7159426c8d13 rebase: properly handle unrebased revision between rebased one Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18446 diff changeset	1409 state[ignored] = revignored
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:
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1411 if obsoletenotrebased[r] is None:
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1412 state[r] = revpruned
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1413 else:
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1414 state[r] = revprecursor
31297 f5c71e98f0f7 rebase: unhide original working directory node as well (issue5219) Martin von Zweigbergk <martinvonz@google.com> parents: 31296 diff changeset	1415 return originalwd, dest.rev(), state
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1416
33590 52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1417 def clearrebased(ui, repo, dest, 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	1418 """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	1419
aafc521668d8 rebase: properly handle --collapse when creating obsolescence marker Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17612 diff changeset	1420 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	1421 `collapsedas` node."""
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	1422 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	1423 # 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	1424 # 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	1425 # and move bookmark backwards.
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1426 bmchanges = [(name, tonode(max(adjustdest(repo, rev, dest, state))))
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1427 for rev in skipped
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1428 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	1429 if bmchanges:
52f82e7d6a7e rebase: move bookmark to destination for commits becoming empty (issue5627) Jun Wu <quark@fb.com> parents: 33569 diff changeset	1430 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	1431 repo._bookmarks.applychanges(repo, tr, bmchanges)
33332 3b7cb3d17137 rebase: use scmutil.cleanupnodes (issue5606) (BC) Jun Wu <quark@fb.com> parents: 33157 diff changeset	1432 mapping = {}
33333 8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1433 for rev, newrev in sorted(state.items()):
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1434 if newrev >= 0 and newrev != rev:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1435 if rev in skipped:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1436 succs = ()
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1437 elif collapsedas is not None:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1438 succs = (collapsedas,)
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1439 else:
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1440 succs = (tonode(newrev),)
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1441 mapping[tonode(rev)] = succs
8bfd10e4c55a rebase: remove "if True" Jun Wu <quark@fb.com> parents: 33332 diff changeset	1442 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	1443
7216 292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	1444 def pullrebase(orig, ui, repo, args, *opts):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1445 '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	1446 ret = None
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1447 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	1448 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	1449 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	1450 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	1451 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	1452
32918 04c9dd951a41 rebase: use context manager for locking in pullrebase() Martin von Zweigbergk <martinvonz@google.com> parents: 32917 diff changeset	1453 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	1454 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	1455 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	1456 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	1457 'the update flag\n')
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1458
30725 c2bd2f77965b rebase: fail-fast the pull if working dir is not clean (BC) Valters Vingolds <valters@vingolds.ch> parents: 30709 diff changeset	1459 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	1460 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	1461 '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	1462
26029 563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1463 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	1464 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	1465 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	1466 pass
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1467 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	1468 try:
26960 6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1469 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	1470 finally:
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1471 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	1472 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	1473 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	1474 # --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	1475 # dropping it
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1476 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	1477 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	1478 # 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	1479 # --source.
563ea14c62d4 rebase: lock the repo during the full rebase operation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25660 diff changeset	1480 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	1481 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	1482 # 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	1483 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	1484 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	1485 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	1486 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	1487 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	1488 # 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	1489 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	1490 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	1491 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	1492 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	1493 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	1494 # 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	1495 # with warning and trumpets
0e3835c7e1cf rebase: perform update through the 'update' command Pierre-Yves David <pierre-yves.david@fb.com> parents: 28117 diff changeset	1496 commands.update(ui, repo)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1497 else:
14444 1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1498 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	1499 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	1500 ret = orig(ui, repo, args, *opts)
6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1501
6979fe2a6d75 rebase: add returning value from pullrebase function liscju <piotr.listkiewicz@gmail.com> parents: 26811 diff changeset	1502 return ret
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1503
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1504 def _setrebasesetvisibility(repo, revs):
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1505 """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	1506
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1507 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	1508 hidden (see issue4504)"""
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1509 repo = repo.unfiltered()
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1510 repo._rebaseset = revs
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1511 # 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	1512 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	1513 if revs & hiddens:
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1514 repo.invalidatevolatilesets()
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1515
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1516 def _clearrebasesetvisibiliy(repo):
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1517 """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	1518 repo = repo.unfiltered()
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1519 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	1520 del repo._rebaseset
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1521
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1522 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	1523 """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	1524 blockers = orig(repo)
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1525 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	1526 return blockers
8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1527
27790 2d294dada4f8 rebase: small refactoring to allow better extensibility from extensions Laurent Charignon <lcharignon@fb.com> parents: 27746 diff changeset	1528 def _filterobsoleterevs(repo, revs):
2d294dada4f8 rebase: small refactoring to allow better extensibility from extensions Laurent Charignon <lcharignon@fb.com> parents: 27746 diff changeset	1529 """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	1530 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	1531
27744 f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1532 def _computeobsoletenotrebased(repo, rebaseobsrevs, dest):
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1533 """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	1534 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	1535
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30273 diff changeset	1536 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	1537 obsoletenotrebased = {}
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1538
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26748 diff changeset	1539 # Build a mapping successor => obsolete nodes for the obsolete
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1540 # nodes to be rebased
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1541 allsuccessors = {}
26674 fd4a38bd7e49 rebase: use a direct reference to repo.changelog Pierre-Yves David <pierre-yves.david@fb.com> parents: 26671 diff changeset	1542 cl = repo.changelog
27744 f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1543 for r in rebaseobsrevs:
f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1544 node = cl.node(r)
33145 0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33139 diff changeset	1545 for s in obsutil.allsuccessors(repo.obsstore, [node]):
27744 f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1546 try:
f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1547 allsuccessors[cl.rev(s)] = cl.rev(node)
f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1548 except LookupError:
f2b8b4e2de20 rebase: minor refactoring of _computeobsoletenotrebased Laurent Charignon <lcharignon@fb.com> parents: 27626 diff changeset	1549 pass
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1550
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1551 if allsuccessors:
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1552 # Look for successors of obsolete nodes to be rebased among
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1553 # the ancestors of dest
33157 5d29c55414b3 rebase: always pass destination as revnum to _handleskippingobsolete() Martin von Zweigbergk <martinvonz@google.com> parents: 33145 diff changeset	1554 ancs = cl.ancestors([dest],
26674 fd4a38bd7e49 rebase: use a direct reference to repo.changelog Pierre-Yves David <pierre-yves.david@fb.com> parents: 26671 diff changeset	1555 stoprev=min(allsuccessors),
fd4a38bd7e49 rebase: use a direct reference to repo.changelog Pierre-Yves David <pierre-yves.david@fb.com> parents: 26671 diff changeset	1556 inclusive=True)
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1557 for s in allsuccessors:
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1558 if s in ancs:
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1559 obsoletenotrebased[allsuccessors[s]] = s
27012 5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1560 elif (s == allsuccessors[s] and
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1561 allsuccessors.values().count(s) == 1):
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1562 # plain prune
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1563 obsoletenotrebased[s] = None
5eac7ab59b95 rebase: don't rebase obsolete commits with no successor Laurent Charignon <lcharignon@fb.com> parents: 27010 diff changeset	1564
26349 92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1565 return obsoletenotrebased
92409f8dff5d rebase: don't rebase obsolete commit whose successor is already rebased Laurent Charignon <lcharignon@fb.com> parents: 26301 diff changeset	1566
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1567 def summaryhook(ui, repo):
30709 a932297febb7 rebase: use repo.vfs.exists in 'hg summary' hook Valters Vingolds <valters@vingolds.ch> parents: 30674 diff changeset	1568 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	1569 return
19849 e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1570 try:
29403 b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	1571 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	1572 rbsrt.restorestatus()
b95fd7c15b7c rebase: move restorestestatus function to be a method of the RR class Kostia Balytskyi <ikostia@fb.com> parents: 29402 diff changeset	1573 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	1574 except error.RepoLookupError:
e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1575 # 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	1576 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	1577 ui.write(msg)
e7fa36d2ad3a rebase: catch RepoLookupError at restoring rebase state for summary FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19848 diff changeset	1578 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	1579 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	1580 # i18n: column positioning for "hg summary"
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1581 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	1582 (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	1583 ui.label(_('%d remaining'), 'rebase.remaining') %
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1584 (len(state) - numrebased)))
0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1585
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1586 def uisetup(ui):
23970 8a544fb645bb rebase: ensure rebase revision remains visible (issue4504) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23917 diff changeset	1587 #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	1588 entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
292fb2ad2846 extensions: use new wrapper functions Matt Mackall <mpm@selenic.com> parents: 7213 diff changeset	1589 entry[1].append(('', 'rebase', None,
14444 1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1590 _("rebase working directory to branch head")))
1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1591 entry[1].append(('t', 'tool', '',
1f997134a9d1 rebase: add option --tool/-t for 'pull --rebase' Adrian Buehlmann <adrian@cadifra.com> parents: 14306 diff changeset	1592 _("specify merge tool for rebase")))
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19059 diff changeset	1593 cmdutil.summaryhooks.add('rebase', summaryhook)
19478 e5a5790a3185 rebase: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19477 diff changeset	1594 cmdutil.unfinishedstates.append(
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19478 diff changeset	1595 ['rebasestate', False, False, _('rebase in progress'),
19478 e5a5790a3185 rebase: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19477 diff changeset	1596 _("use 'hg rebase --continue' or 'hg rebase --abort'")])
27626 157675d0f600 rebase: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27586 diff changeset	1597 cmdutil.afterresolvedstates.append(
157675d0f600 rebase: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27586 diff changeset	1598 ['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	1599 # ensure rebased rev are not hidden
32586 47e4c6bb39f1 hidden: rename "revealedrevs" to "pinnedrevs" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 32427 diff changeset	1600 extensions.wrapfunction(repoview, 'pinnedrevs', _rebasedvisible)

Mercurial > public > mercurial-scm > hg

annotate hgext/rebase.py @ 33806:dedab036215d