hgext/transplant.py
author Gregory Szorc <gregory.szorc@gmail.com>
Tue, 21 Aug 2018 00:01:54 +0000
changeset 39282 828a45233036
parent 38370 c7eb9bce6041
child 39777 b63dee7bd0d9
permissions -rw-r--r--
debugcommands: introduce debugrevlogindex (BC) `hg debugindex` was originally invented for displaying revlog index data and is highly tailored towards that. e.g. it accepts a --format option to display index data for a particular revlog version and displays things like offset and length. As we support non-revlog storage, it makes sense for `hg debugindex` to display generic index data and for there to exist storage-specific or storage-aware debug* commands for dumping non-generic index data. This commit effectively renames `hg debugindex` to `hg debugrevlogindex` and replaces `hg debugindex` with a version that is storage agnostic. Tests using --format have been updated to use `hg debugrevlogindex`. Output is backwards compatible. The replacement command uses the formatter, which means output can be templatized. At some point, we may want to tweak output (e.g. to add the revision size). But I don't feel like taking a bigger BC break at the moment. The renamed command/function had to be moved because check-code enforces alphabetical ordering of commands in this file. Differential Revision: https://phab.mercurial-scm.org/D4358
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     1
# Patch transplanting extension for Mercurial
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     2
#
4635
63b9d2deed48 Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4516
diff changeset
     3
# Copyright 2006, 2007 Brendan Cully <brendan@kublai.com>
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     4
#
8225
46293a0c7e9f updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents: 8209
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: 9995
diff changeset
     6
# GNU General Public License version 2 or any later version.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     7
8934
9dda4c73fc3b extensions: change descriptions for extensions providing a few commands
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8894
diff changeset
     8
'''command to transplant changesets from another branch
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     9
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
    10
This extension allows you to transplant changes to another parent revision,
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
    11
possibly in another repository. The transplant is done using 'diff' patches.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    12
8000
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
    13
Transplanted patches are recorded in .hg/transplant/transplants, as a
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
    14
map from a changeset hash to its hash in the source repository.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    15
'''
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    16
from __future__ import absolute_import
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    17
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    18
import os
38164
aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path
Yuya Nishihara <yuya@tcha.org>
parents: 37311
diff changeset
    19
7629
97253bcb44a8 transplant: move docstrings before imports (see issue1466)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7415
diff changeset
    20
from mercurial.i18n import _
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    21
from mercurial import (
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    22
    bundlerepo,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    23
    cmdutil,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    24
    error,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    25
    exchange,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    26
    hg,
35888
c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34469
diff changeset
    27
    logcmdutil,
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    28
    match,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    29
    merge,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    30
    node as nodemod,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    31
    patch,
30925
82f1ef8b4477 py3: convert the mode argument of os.fdopen to unicodes (2 of 2)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29841
diff changeset
    32
    pycompat,
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    33
    registrar,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    34
    revlog,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    35
    revset,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    36
    scmutil,
31023
aea06029919e revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents: 30925
diff changeset
    37
    smartset,
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    38
    util,
31245
c1ebe18d5156 vfs: use 'vfs' module directly in 'hgext.transplant'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 31216
diff changeset
    39
    vfs as vfsmod,
28481
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
    40
)
37084
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 36835
diff changeset
    41
from mercurial.utils import (
37120
a8a902d7176e procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 37084
diff changeset
    42
    procutil,
37084
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 36835
diff changeset
    43
    stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 36835
diff changeset
    44
)
7629
97253bcb44a8 transplant: move docstrings before imports (see issue1466)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7415
diff changeset
    45
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
    46
class TransplantError(error.Abort):
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
    47
    pass
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
    48
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
    49
cmdtable = {}
32337
46ba2cdda476 registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 31336
diff changeset
    50
command = registrar.command(cmdtable)
29841
d5883fd055c6 extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents: 28540
diff changeset
    51
# 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: 24365
diff changeset
    52
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents: 24365
diff changeset
    53
# 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: 24365
diff changeset
    54
# leave the attribute unspecified.
29841
d5883fd055c6 extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents: 28540
diff changeset
    55
testedwith = 'ships-with-hg-core'
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
    56
34468
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    57
configtable = {}
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    58
configitem = registrar.configitem(configtable)
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    59
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    60
configitem('transplant', 'filter',
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    61
    default=None,
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    62
)
34469
61275d0f6157 configitems: register the 'transplant.log' config
Boris Feld <boris.feld@octobus.net>
parents: 34468
diff changeset
    63
configitem('transplant', 'log',
61275d0f6157 configitems: register the 'transplant.log' config
Boris Feld <boris.feld@octobus.net>
parents: 34468
diff changeset
    64
    default=None,
61275d0f6157 configitems: register the 'transplant.log' config
Boris Feld <boris.feld@octobus.net>
parents: 34468
diff changeset
    65
)
34468
7bcce17b87e8 configitems: register the 'transplant.filter' config
Boris Feld <boris.feld@octobus.net>
parents: 32337
diff changeset
    66
8778
c5f36402daad use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8706
diff changeset
    67
class transplantentry(object):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    68
    def __init__(self, lnode, rnode):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    69
        self.lnode = lnode
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    70
        self.rnode = rnode
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    71
8778
c5f36402daad use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8706
diff changeset
    72
class transplants(object):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    73
    def __init__(self, path=None, transplantfile=None, opener=None):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    74
        self.path = path
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    75
        self.transplantfile = transplantfile
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    76
        self.opener = opener
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    77
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    78
        if not opener:
31245
c1ebe18d5156 vfs: use 'vfs' module directly in 'hgext.transplant'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 31216
diff changeset
    79
            self.opener = vfsmod.vfs(self.path)
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
    80
        self.transplants = {}
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    81
        self.dirty = False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    82
        self.read()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    83
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    84
    def read(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    85
        abspath = os.path.join(self.path, self.transplantfile)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    86
        if self.transplantfile and os.path.exists(abspath):
14168
135e244776f0 prevent transient leaks of file handle by using new helper functions
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 14161
diff changeset
    87
            for line in self.opener.read(self.transplantfile).splitlines():
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    88
                lnode, rnode = map(revlog.bin, line.split(':'))
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
    89
                list = self.transplants.setdefault(rnode, [])
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
    90
                list.append(transplantentry(lnode, rnode))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    91
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    92
    def write(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    93
        if self.dirty and self.transplantfile:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    94
            if not os.path.isdir(self.path):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    95
                os.mkdir(self.path)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    96
            fp = self.opener(self.transplantfile, 'w')
12349
7340b0fa049a transplant: fix var name conflict introduced by 2912881c2a98
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12347
diff changeset
    97
            for list in self.transplants.itervalues():
7340b0fa049a transplant: fix var name conflict introduced by 2912881c2a98
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12347
diff changeset
    98
                for t in list:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
    99
                    l, r = map(nodemod.hex, (t.lnode, t.rnode))
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   100
                    fp.write(l + ':' + r + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   101
            fp.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   102
        self.dirty = False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   103
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   104
    def get(self, rnode):
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   105
        return self.transplants.get(rnode) or []
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   106
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   107
    def set(self, lnode, rnode):
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   108
        list = self.transplants.setdefault(rnode, [])
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   109
        list.append(transplantentry(lnode, rnode))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   110
        self.dirty = True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   111
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   112
    def remove(self, transplant):
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   113
        list = self.transplants.get(transplant.rnode)
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   114
        if list:
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   115
            del list[list.index(transplant)]
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
   116
            self.dirty = True
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   117
8778
c5f36402daad use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8706
diff changeset
   118
class transplanter(object):
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20988
diff changeset
   119
    def __init__(self, ui, repo, opts):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   120
        self.ui = ui
31336
0199686a1a1c transplant: directly use repo.vfs.join
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 31245
diff changeset
   121
        self.path = repo.vfs.join('transplant')
31245
c1ebe18d5156 vfs: use 'vfs' module directly in 'hgext.transplant'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 31216
diff changeset
   122
        self.opener = vfsmod.vfs(self.path)
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   123
        self.transplants = transplants(self.path, 'transplants',
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   124
                                       opener=self.opener)
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
   125
        def getcommiteditor():
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
   126
            editform = cmdutil.mergeeditform(repo[None], 'transplant')
36190
7fda2a8ed24e py3: use pycompat.{bytes|str}kwargs in transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36189
diff changeset
   127
            return cmdutil.getcommiteditor(editform=editform,
7fda2a8ed24e py3: use pycompat.{bytes|str}kwargs in transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36189
diff changeset
   128
                                           **pycompat.strkwargs(opts))
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
   129
        self.getcommiteditor = getcommiteditor
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   130
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   131
    def applied(self, repo, node, parent):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   132
        '''returns True if a node is already an ancestor of parent
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
   133
        or is parent or has already been transplanted'''
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
   134
        if hasnode(repo, parent):
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
   135
            parentrev = repo.changelog.rev(parent)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   136
        if hasnode(repo, node):
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
   137
            rev = repo.changelog.rev(node)
18082
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
   138
            reachable = repo.changelog.ancestors([parentrev], rev,
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
   139
                                                 inclusive=True)
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
   140
            if rev in reachable:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   141
                return True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   142
        for t in self.transplants.get(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   143
            # it might have been stripped
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   144
            if not hasnode(repo, t.lnode):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   145
                self.transplants.remove(t)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   146
                return False
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
   147
            lnoderev = repo.changelog.rev(t.lnode)
18082
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
   148
            if lnoderev in repo.changelog.ancestors([parentrev], lnoderev,
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
   149
                                                    inclusive=True):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   150
                return True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   151
        return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   152
26346
2449a0a6ebda transplant: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25879
diff changeset
   153
    def apply(self, repo, source, revmap, merges, opts=None):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   154
        '''apply the revisions in revmap one by one in revision order'''
26346
2449a0a6ebda transplant: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25879
diff changeset
   155
        if opts is None:
2449a0a6ebda transplant: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25879
diff changeset
   156
            opts = {}
8209
a1a5a57efe90 replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents: 8176
diff changeset
   157
        revs = sorted(revmap)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   158
        p1, p2 = repo.dirstate.parents()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   159
        pulls = []
23452
86c0d8c1484f transplant: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 23270
diff changeset
   160
        diffopts = patch.difffeatureopts(self.ui, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   161
        diffopts.git = True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   162
27289
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   163
        lock = tr = None
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   164
        try:
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   165
            lock = repo.lock()
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
   166
            tr = repo.transaction('transplant')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   167
            for rev in revs:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   168
                node = revmap[rev]
36188
4e33aa8639d0 py3: use "%d" for converting int to bytes in transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36187
diff changeset
   169
                revstr = '%d:%s' % (rev, nodemod.short(node))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   170
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   171
                if self.applied(repo, node, p1):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   172
                    self.ui.warn(_('skipping already applied revision %s\n') %
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   173
                                 revstr)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   174
                    continue
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   175
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   176
                parents = source.changelog.parents(node)
16627
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16551
diff changeset
   177
                if not (opts.get('filter') or opts.get('log')):
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   178
                    # If the changeset parent is the same as the
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   179
                    # wdir's parent, just pull it.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   180
                    if parents[0] == p1:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   181
                        pulls.append(node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   182
                        p1 = node
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   183
                        continue
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   184
                    if pulls:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   185
                        if source != repo:
22699
74da54e52d7c transplant: use exchange.pull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22252
diff changeset
   186
                            exchange.pull(repo, source.peer(), heads=pulls)
27344
43c00ca887d1 merge: have merge.update use a matcher instead of partial fn
Augie Fackler <augie@google.com>
parents: 27322
diff changeset
   187
                        merge.update(repo, pulls[-1], False, False)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   188
                        p1, p2 = repo.dirstate.parents()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   189
                        pulls = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   190
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   191
                domerge = False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   192
                if node in merges:
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   193
                    # pulling all the merge revs at once would mean we
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   194
                    # couldn't transplant after the latest even if
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   195
                    # transplants before them fail.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   196
                    domerge = True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   197
                    if not hasnode(repo, node):
22699
74da54e52d7c transplant: use exchange.pull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22252
diff changeset
   198
                        exchange.pull(repo, source.peer(), heads=[node])
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   199
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   200
                skipmerge = False
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   201
                if parents[1] != revlog.nullid:
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   202
                    if not opts.get('parent'):
36188
4e33aa8639d0 py3: use "%d" for converting int to bytes in transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36187
diff changeset
   203
                        self.ui.note(_('skipping merge changeset %d:%s\n')
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   204
                                     % (rev, nodemod.short(node)))
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   205
                        skipmerge = True
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   206
                    else:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   207
                        parent = source.lookup(opts['parent'])
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   208
                        if parent not in parents:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   209
                            raise error.Abort(_('%s is not a parent of %s') %
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   210
                                              (nodemod.short(parent),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   211
                                               nodemod.short(node)))
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   212
                else:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   213
                    parent = parents[0]
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   214
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   215
                if skipmerge:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   216
                    patchfile = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   217
                else:
38164
aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path
Yuya Nishihara <yuya@tcha.org>
parents: 37311
diff changeset
   218
                    fd, patchfile = pycompat.mkstemp(prefix='hg-transplant-')
36835
5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer
Yuya Nishihara <yuya@tcha.org>
parents: 36514
diff changeset
   219
                    fp = os.fdopen(fd, r'wb')
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   220
                    gen = patch.diff(source, parent, node, opts=diffopts)
7308
b6f5490effbf patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7280
diff changeset
   221
                    for chunk in gen:
b6f5490effbf patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7280
diff changeset
   222
                        fp.write(chunk)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   223
                    fp.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   224
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   225
                del revmap[rev]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   226
                if patchfile or domerge:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   227
                    try:
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   228
                        try:
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   229
                            n = self.applyone(repo, node,
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   230
                                              source.changelog.read(node),
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   231
                                              patchfile, merge=domerge,
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   232
                                              log=opts.get('log'),
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   233
                                              filter=opts.get('filter'))
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   234
                        except TransplantError:
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   235
                            # Do not rollback, it is up to the user to
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   236
                            # fix the merge or cancel everything
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   237
                            tr.close()
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   238
                            raise
4251
e76e52145c3d transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents: 4072
diff changeset
   239
                        if n and domerge:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   240
                            self.ui.status(_('%s merged at %s\n') % (revstr,
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   241
                                      nodemod.short(n)))
4251
e76e52145c3d transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents: 4072
diff changeset
   242
                        elif n:
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   243
                            self.ui.status(_('%s transplanted to %s\n')
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   244
                                           % (nodemod.short(node),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   245
                                              nodemod.short(n)))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   246
                    finally:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   247
                        if patchfile:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   248
                            os.unlink(patchfile)
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
   249
            tr.close()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   250
            if pulls:
22699
74da54e52d7c transplant: use exchange.pull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22252
diff changeset
   251
                exchange.pull(repo, source.peer(), heads=pulls)
27344
43c00ca887d1 merge: have merge.update use a matcher instead of partial fn
Augie Fackler <augie@google.com>
parents: 27322
diff changeset
   252
                merge.update(repo, pulls[-1], False, False)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   253
        finally:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   254
            self.saveseries(revmap, merges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   255
            self.transplants.write()
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
   256
            if tr:
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
   257
                tr.release()
25879
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25828
diff changeset
   258
            if lock:
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25828
diff changeset
   259
                lock.release()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   260
13579
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 13031
diff changeset
   261
    def filter(self, filter, node, changelog, patchfile):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   262
        '''arbitrarily rewrite changeset before applying it'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   263
6966
057ced2b8543 i18n: mark strings for translation in transplant extension
Martin Geisler <mg@daimi.au.dk>
parents: 6762
diff changeset
   264
        self.ui.status(_('filtering %s\n') % patchfile)
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   265
        user, date, msg = (changelog[1], changelog[2], changelog[4])
38164
aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path
Yuya Nishihara <yuya@tcha.org>
parents: 37311
diff changeset
   266
        fd, headerfile = pycompat.mkstemp(prefix='hg-transplant-')
36835
5bc7ff103081 py3: use r'' instead of sysstr('') to get around code transformer
Yuya Nishihara <yuya@tcha.org>
parents: 36514
diff changeset
   267
        fp = os.fdopen(fd, r'wb')
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   268
        fp.write("# HG changeset patch\n")
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   269
        fp.write("# User %s\n" % user)
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   270
        fp.write("# Date %d %d\n" % date)
9433
f01a22096f1f transplant: Add trailing LF in tmp file for filtering
Mads Kiilerich <mads@kiilerich.com>
parents: 9183
diff changeset
   271
        fp.write(msg + '\n')
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   272
        fp.close()
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   273
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   274
        try:
37120
a8a902d7176e procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 37084
diff changeset
   275
            self.ui.system('%s %s %s' % (filter,
a8a902d7176e procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 37084
diff changeset
   276
                                         procutil.shellquote(headerfile),
a8a902d7176e procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 37084
diff changeset
   277
                                         procutil.shellquote(patchfile)),
23270
41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter
Yuya Nishihara <yuya@tcha.org>
parents: 22699
diff changeset
   278
                           environ={'HGUSER': changelog[1],
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   279
                                    'HGREVISION': nodemod.hex(node),
23270
41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter
Yuya Nishihara <yuya@tcha.org>
parents: 22699
diff changeset
   280
                                    },
31202
2db38ef73ce8 transplant: set a blockedtag when invoking external filter
Simon Farnsworth <simonfar@fb.com>
parents: 31023
diff changeset
   281
                           onerr=error.Abort, errprefix=_('filter failed'),
2db38ef73ce8 transplant: set a blockedtag when invoking external filter
Simon Farnsworth <simonfar@fb.com>
parents: 31023
diff changeset
   282
                           blockedtag='transplant_filter')
36189
2f309b8846cf py3: replace file() with open() in transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36188
diff changeset
   283
            user, date, msg = self.parselog(open(headerfile, 'rb'))[1:4]
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   284
        finally:
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   285
            os.unlink(headerfile)
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   286
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   287
        return (user, date, msg)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   288
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   289
    def applyone(self, repo, node, cl, patchfile, merge=False, log=False,
4917
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents: 4915
diff changeset
   290
                 filter=None):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   291
        '''apply the patch in patchfile to the repository as a transplant'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   292
        (manifest, user, (time, timezone), files, message) = cl[:5]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   293
        date = "%d %d" % (time, timezone)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   294
        extra = {'transplant_source': node}
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   295
        if filter:
13579
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 13031
diff changeset
   296
            (user, date, message) = self.filter(filter, node, cl, patchfile)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   297
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   298
        if log:
9183
d0225fa2f6c4 do not translate commit messages
Martin Geisler <mg@lazybytes.net>
parents: 8934
diff changeset
   299
            # we don't translate messages inserted into commits
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   300
            message += '\n(transplanted from %s)' % nodemod.hex(node)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   301
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   302
        self.ui.status(_('applying %s\n') % nodemod.short(node))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   303
        self.ui.note('%s %s\n%s\n' % (user, date, message))
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   304
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   305
        if not patchfile and not merge:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   306
            raise error.Abort(_('can only omit patchfile if merging'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   307
        if patchfile:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   308
            try:
14564
65f4512e40e4 patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com>
parents: 14556
diff changeset
   309
                files = set()
14382
2d16f15da7bd patch: remove patch.patch() cwd argument
Patrick Mezard <pmezard@gmail.com>
parents: 14319
diff changeset
   310
                patch.patch(self.ui, repo, patchfile, files=files, eolmode=None)
14260
00a881581400 patch: make patch()/internalpatch() always update the dirstate
Patrick Mezard <pmezard@gmail.com>
parents: 14259
diff changeset
   311
                files = list(files)
25660
328739ea70c3 global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents: 25186
diff changeset
   312
            except Exception as inst:
3757
faed44bab17b transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents: 3752
diff changeset
   313
                seriespath = os.path.join(self.path, 'series')
faed44bab17b transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents: 3752
diff changeset
   314
                if os.path.exists(seriespath):
faed44bab17b transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents: 3752
diff changeset
   315
                    os.unlink(seriespath)
13878
a8d13ee0ce68 misc: replace .parents()[0] with p1()
Matt Mackall <mpm@selenic.com>
parents: 13790
diff changeset
   316
                p1 = repo.dirstate.p1()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   317
                p2 = node
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
   318
                self.log(user, date, message, p1, p2, merge=merge)
37084
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents: 36835
diff changeset
   319
                self.ui.write(stringutil.forcebytestr(inst) + '\n')
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27586
diff changeset
   320
                raise TransplantError(_('fix up the working directory and run '
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
   321
                                        'hg transplant --continue'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   322
        else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   323
            files = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   324
        if merge:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   325
            p1, p2 = repo.dirstate.parents()
16551
ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407)
Patrick Mezard <patrick@mezard.eu>
parents: 16507
diff changeset
   326
            repo.setparents(p1, node)
8703
8676dd819444 transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents: 8615
diff changeset
   327
            m = match.always(repo.root, '')
8676dd819444 transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents: 8615
diff changeset
   328
        else:
8676dd819444 transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents: 8615
diff changeset
   329
            m = match.exact(repo.root, '', files)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   330
15220
f7db54b832af transplant: add --edit option
Matt Mackall <mpm@selenic.com>
parents: 15204
diff changeset
   331
        n = repo.commit(message, user, date, extra=extra, match=m,
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
   332
                        editor=self.getcommiteditor())
11638
79231258503b transplant: crash if repo.commit() finds nothing to commit
Greg Ward <greg-hg@gerg.ca>
parents: 11411
diff changeset
   333
        if not n:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   334
            self.ui.warn(_('skipping emptied changeset %s\n') %
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   335
                           nodemod.short(node))
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17299
diff changeset
   336
            return None
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   337
        if not merge:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   338
            self.transplants.set(n, node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   339
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   340
        return n
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   341
27677
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   342
    def canresume(self):
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   343
        return os.path.exists(os.path.join(self.path, 'journal'))
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   344
18919
cdf764a2f7a5 repoview: remove unreachable code
Bryan O'Sullivan <bryano@fb.com>
parents: 18082
diff changeset
   345
    def resume(self, repo, source, opts):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   346
        '''recover last transaction and apply remaining changesets'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   347
        if os.path.exists(os.path.join(self.path, 'journal')):
18926
8deaa703a622 transplant: pass source through to recover
Bryan O'Sullivan <bryano@fb.com>
parents: 18919
diff changeset
   348
            n, node = self.recover(repo, source, opts)
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   349
            if n:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   350
                self.ui.status(_('%s transplanted as %s\n') %
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   351
                                 (nodemod.short(node),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   352
                                  nodemod.short(n)))
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   353
            else:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   354
                self.ui.status(_('%s skipped due to empty diff\n')
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   355
                               % (nodemod.short(node),))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   356
        seriespath = os.path.join(self.path, 'series')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   357
        if not os.path.exists(seriespath):
3758
889f7e74a0d9 transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents: 3757
diff changeset
   358
            self.transplants.write()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   359
            return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   360
        nodes, merges = self.readseries()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   361
        revmap = {}
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   362
        for n in nodes:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   363
            revmap[source.changelog.rev(n)] = n
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   364
        os.unlink(seriespath)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   365
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   366
        self.apply(repo, source, revmap, merges, opts)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   367
18926
8deaa703a622 transplant: pass source through to recover
Bryan O'Sullivan <bryano@fb.com>
parents: 18919
diff changeset
   368
    def recover(self, repo, source, opts):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   369
        '''commit working directory using journal metadata'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   370
        node, user, date, message, parents = self.readlog()
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   371
        merge = False
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   372
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   373
        if not user or not date or not message or not parents[0]:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   374
            raise error.Abort(_('transplant log file is corrupt'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   375
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   376
        parent = parents[0]
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   377
        if len(parents) > 1:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   378
            if opts.get('parent'):
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   379
                parent = source.lookup(opts['parent'])
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   380
                if parent not in parents:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   381
                    raise error.Abort(_('%s is not a parent of %s') %
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   382
                                      (nodemod.short(parent),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   383
                                       nodemod.short(node)))
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   384
            else:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   385
                merge = True
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   386
3758
889f7e74a0d9 transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents: 3757
diff changeset
   387
        extra = {'transplant_source': node}
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   388
        try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   389
            p1, p2 = repo.dirstate.parents()
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   390
            if p1 != parent:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   391
                raise error.Abort(_('working directory not at transplant '
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   392
                                   'parent %s') % nodemod.hex(parent))
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   393
            if merge:
16551
ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407)
Patrick Mezard <patrick@mezard.eu>
parents: 16507
diff changeset
   394
                repo.setparents(p1, parents[1])
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   395
            modified, added, removed, deleted = repo.status()[:4]
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   396
            if merge or modified or added or removed or deleted:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   397
                n = repo.commit(message, user, date, extra=extra,
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   398
                                editor=self.getcommiteditor())
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   399
                if not n:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   400
                    raise error.Abort(_('commit failed'))
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   401
                if not merge:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   402
                    self.transplants.set(n, node)
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   403
            else:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
   404
                n = None
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   405
            self.unlog()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   406
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   407
            return n, node
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
   408
        finally:
27289
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   409
            # TODO: get rid of this meaningless try/finally enclosing.
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   410
            # this is kept only to reduce changes in a patch.
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   411
            pass
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   412
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   413
    def readseries(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   414
        nodes = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   415
        merges = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   416
        cur = nodes
14168
135e244776f0 prevent transient leaks of file handle by using new helper functions
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 14161
diff changeset
   417
        for line in self.opener.read('series').splitlines():
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   418
            if line.startswith('# Merges'):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   419
                cur = merges
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   420
                continue
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   421
            cur.append(revlog.bin(line))
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   422
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   423
        return (nodes, merges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   424
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   425
    def saveseries(self, revmap, merges):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   426
        if not revmap:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   427
            return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   428
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   429
        if not os.path.isdir(self.path):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   430
            os.mkdir(self.path)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   431
        series = self.opener('series', 'w')
8209
a1a5a57efe90 replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents: 8176
diff changeset
   432
        for rev in sorted(revmap):
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   433
            series.write(nodemod.hex(revmap[rev]) + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   434
        if merges:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   435
            series.write('# Merges\n')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   436
            for m in merges:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   437
                series.write(nodemod.hex(m) + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   438
        series.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   439
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   440
    def parselog(self, fp):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   441
        parents = []
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   442
        message = []
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   443
        node = revlog.nullid
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   444
        inmsg = False
13789
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13742
diff changeset
   445
        user = None
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13742
diff changeset
   446
        date = None
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   447
        for line in fp.read().splitlines():
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   448
            if inmsg:
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   449
                message.append(line)
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   450
            elif line.startswith('# User '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   451
                user = line[7:]
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   452
            elif line.startswith('# Date '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   453
                date = line[7:]
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   454
            elif line.startswith('# Node ID '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   455
                node = revlog.bin(line[10:])
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   456
            elif line.startswith('# Parent '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   457
                parents.append(revlog.bin(line[9:]))
11411
5834e79b24f7 transplant: when reading journal, treat only lines starting with "# " special like patch.extract() does
Georg Brandl <georg@python.org>
parents: 11321
diff changeset
   458
            elif not line.startswith('# '):
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   459
                inmsg = True
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   460
                message.append(line)
13789
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13742
diff changeset
   461
        if None in (user, date):
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   462
            raise error.Abort(_("filter corrupted changeset (no user or date)"))
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   463
        return (node, user, date, '\n'.join(message), parents)
4516
96d8a56d4ef9 Removed trailing whitespace and tabs from python files
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4251
diff changeset
   464
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
   465
    def log(self, user, date, message, p1, p2, merge=False):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   466
        '''journal changelog metadata for later recover'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   467
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   468
        if not os.path.isdir(self.path):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   469
            os.mkdir(self.path)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   470
        fp = self.opener('journal', 'w')
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
   471
        fp.write('# User %s\n' % user)
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
   472
        fp.write('# Date %s\n' % date)
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   473
        fp.write('# Node ID %s\n' % nodemod.hex(p2))
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   474
        fp.write('# Parent ' + nodemod.hex(p1) + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   475
        if merge:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   476
            fp.write('# Parent ' + nodemod.hex(p2) + '\n')
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
   477
        fp.write(message.rstrip() + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   478
        fp.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   479
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   480
    def readlog(self):
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
   481
        return self.parselog(self.opener('journal'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   482
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   483
    def unlog(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   484
        '''remove changelog journal'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   485
        absdst = os.path.join(self.path, 'journal')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   486
        if os.path.exists(absdst):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   487
            os.unlink(absdst)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   488
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   489
    def transplantfilter(self, repo, source, root):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   490
        def matchfn(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   491
            if self.applied(repo, node, root):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   492
                return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   493
            if source.changelog.parents(node)[1] != revlog.nullid:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   494
                return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   495
            extra = source.changelog.read(node)[5]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   496
            cnode = extra.get('transplant_source')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   497
            if cnode and self.applied(repo, cnode, root):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   498
                return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   499
            return True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   500
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   501
        return matchfn
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   502
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   503
def hasnode(repo, node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   504
    try:
13031
3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons
Martin Geisler <mg@aragost.com>
parents: 12823
diff changeset
   505
        return repo.changelog.rev(node) is not None
7633
08cabecfa8a8 errors: move revlog errors
Matt Mackall <mpm@selenic.com>
parents: 7629
diff changeset
   506
    except error.RevlogError:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   507
        return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   508
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   509
def browserevs(ui, repo, nodes, opts):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   510
    '''interactively transplant changesets'''
35888
c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34469
diff changeset
   511
    displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   512
    transplants = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   513
    merges = []
20268
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   514
    prompt = _('apply changeset? [ynmpcq?]:'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   515
               '$$ &yes, transplant this changeset'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   516
               '$$ &no, skip this changeset'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   517
               '$$ &merge at this changeset'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   518
               '$$ show &patch'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   519
               '$$ &commit selected changesets'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   520
               '$$ &quit and cancel transplant'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
   521
               '$$ &? (show this help)')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   522
    for node in nodes:
7369
87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7308
diff changeset
   523
        displayer.show(repo[node])
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   524
        action = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   525
        while not action:
38370
c7eb9bce6041 py3: slice over bytes to prevent getting ascii values
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38369
diff changeset
   526
            choice = ui.promptchoice(prompt)
c7eb9bce6041 py3: slice over bytes to prevent getting ascii values
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38369
diff changeset
   527
            action = 'ynmpcq?'[choice:choice + 1]
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   528
            if action == '?':
20269
acb6cceaffd5 transplant: use "ui.extractchoices()" to show the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20268
diff changeset
   529
                for c, t in ui.extractchoices(prompt)[1]:
acb6cceaffd5 transplant: use "ui.extractchoices()" to show the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20268
diff changeset
   530
                    ui.write('%s: %s\n' % (c, t))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   531
                action = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   532
            elif action == 'p':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   533
                parent = repo.changelog.parents(node)[0]
7308
b6f5490effbf patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7280
diff changeset
   534
                for chunk in patch.diff(repo, parent, node):
8615
94ca38e63576 use ui instead of repo.ui when the former is in scope
Martin Geisler <mg@lazybytes.net>
parents: 8225
diff changeset
   535
                    ui.write(chunk)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   536
                action = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   537
        if action == 'y':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   538
            transplants.append(node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   539
        elif action == 'm':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   540
            merges.append(node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   541
        elif action == 'c':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   542
            break
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   543
        elif action == 'q':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   544
            transplants = ()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   545
            merges = ()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   546
            break
10152
56284451a22c Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents: 9995
diff changeset
   547
    displayer.close()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   548
    return (transplants, merges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   549
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   550
@command('transplant',
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   551
    [('s', 'source', '', _('transplant changesets from REPO'), _('REPO')),
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   552
    ('b', 'branch', [], _('use this source changeset as head'), _('REV')),
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   553
    ('a', 'all', None, _('pull all changesets up to the --branch revisions')),
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   554
    ('p', 'prune', [], _('skip over REV'), _('REV')),
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   555
    ('m', 'merge', [], _('merge at REV'), _('REV')),
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   556
    ('', 'parent', '',
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   557
     _('parent to choose when transplanting merge'), _('REV')),
15220
f7db54b832af transplant: add --edit option
Matt Mackall <mpm@selenic.com>
parents: 15204
diff changeset
   558
    ('e', 'edit', False, _('invoke editor on commit messages')),
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   559
    ('', 'log', None, _('append transplant info to log message')),
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   560
    ('c', 'continue', None, _('continue last transplant session '
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   561
                              'after fixing conflicts')),
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   562
    ('', 'filter', '',
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   563
     _('filter changesets through command'), _('CMD'))],
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   564
    _('hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] '
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
   565
      '[-m REV] [REV]...'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   566
def transplant(ui, repo, *revs, **opts):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   567
    '''transplant changesets from another branch
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   568
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   569
    Selected changesets will be applied on top of the current working
13605
888ec2650c2d transplant: explain that changesets are copied, not moved
Martin Geisler <mg@lazybytes.net>
parents: 13031
diff changeset
   570
    directory with the log of the original changeset. The changesets
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   571
    are copied and will thus appear twice in the history with different
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   572
    identities.
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   573
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   574
    Consider using the graft command if everything is inside the same
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   575
    repository - it will use merges and will usually give a better result.
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   576
    Use the rebase extension if the changesets are unpublished and you want
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   577
    to move them instead of copying them.
13605
888ec2650c2d transplant: explain that changesets are copied, not moved
Martin Geisler <mg@lazybytes.net>
parents: 13031
diff changeset
   578
888ec2650c2d transplant: explain that changesets are copied, not moved
Martin Geisler <mg@lazybytes.net>
parents: 13031
diff changeset
   579
    If --log is specified, log messages will have a comment appended
888ec2650c2d transplant: explain that changesets are copied, not moved
Martin Geisler <mg@lazybytes.net>
parents: 13031
diff changeset
   580
    of the form::
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   581
9200
6b4c527c3d22 transplant: better reST formatting
Martin Geisler <mg@lazybytes.net>
parents: 9196
diff changeset
   582
      (transplanted from CHANGESETHASH)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   583
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   584
    You can rewrite the changelog message with the --filter option.
8000
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   585
    Its argument will be invoked with the current changelog message as
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   586
    $1 and the patch as $2.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   587
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   588
    --source/-s specifies another repository to use for selecting changesets,
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   589
    just as if it temporarily had been pulled.
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   590
    If --branch/-b is specified, these revisions will be used as
19951
d51c4d85ec23 spelling: random spell checker fixes
Mads Kiilerich <madski@unity3d.com>
parents: 19496
diff changeset
   591
    heads when deciding which changesets to transplant, just as if only
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   592
    these revisions had been pulled.
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   593
    If --all/-a is specified, all the revisions up to the heads specified
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   594
    with --branch will be transplanted.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   595
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   596
    Example:
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   597
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   598
    - transplant all changes up to REV on top of your current revision::
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   599
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   600
        hg transplant --branch REV --all
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   601
8000
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   602
    You can optionally mark selected transplanted changesets as merge
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   603
    changesets. You will not be prompted to transplant any ancestors
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   604
    of a merged transplant, and you can merge descendants of them
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   605
    normally instead of transplanting them.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   606
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   607
    Merge changesets may be transplanted directly by specifying the
16457
91196ebcaeed transplant: remove extraneous whitespace
Steven Stallion <sstallion@gmail.com>
parents: 16400
diff changeset
   608
    proper parent changeset by calling :hg:`transplant --parent`.
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
   609
11193
687c7d395f20 Use our custom hg reStructuredText role some more
Martin Geisler <mg@aragost.com>
parents: 10510
diff changeset
   610
    If no merges or revisions are provided, :hg:`transplant` will
687c7d395f20 Use our custom hg reStructuredText role some more
Martin Geisler <mg@aragost.com>
parents: 10510
diff changeset
   611
    start an interactive changeset browser.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   612
8000
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
   613
    If a changeset application fails, you can fix the merge by hand
11193
687c7d395f20 Use our custom hg reStructuredText role some more
Martin Geisler <mg@aragost.com>
parents: 10510
diff changeset
   614
    and then resume where you left off by calling :hg:`transplant
687c7d395f20 Use our custom hg reStructuredText role some more
Martin Geisler <mg@aragost.com>
parents: 10510
diff changeset
   615
    --continue/-c`.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   616
    '''
27840
dc237afacbd4 with: use context manager for wlock in transplant
Bryan O'Sullivan <bryano@fb.com>
parents: 27678
diff changeset
   617
    with repo.wlock():
27289
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   618
        return _dotransplant(ui, repo, *revs, **opts)
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   619
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
   620
def _dotransplant(ui, repo, *revs, **opts):
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   621
    def incwalk(repo, csets, match=util.always):
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   622
        for node in csets:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   623
            if match(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   624
                yield node
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   625
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   626
    def transplantwalk(repo, dest, heads, match=util.always):
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   627
        '''Yield all nodes that are ancestors of a head but not ancestors
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   628
        of dest.
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   629
        If no heads are specified, the heads of repo will be used.'''
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   630
        if not heads:
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   631
            heads = repo.heads()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   632
        ancestors = []
20988
8c2f1e2a11ff transplant: use context ancestor instead of changelog ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 20442
diff changeset
   633
        ctx = repo[dest]
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   634
        for head in heads:
20988
8c2f1e2a11ff transplant: use context ancestor instead of changelog ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 20442
diff changeset
   635
            ancestors.append(ctx.ancestor(repo[head]).node())
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   636
        for node in repo.changelog.nodesbetween(ancestors, heads)[0]:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   637
            if match(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   638
                yield node
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   639
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   640
    def checkopts(opts, revs):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   641
        if opts.get('continue'):
10282
08a0f04b56bd many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents: 10264
diff changeset
   642
            if opts.get('branch') or opts.get('all') or opts.get('merge'):
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   643
                raise error.Abort(_('--continue is incompatible with '
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
   644
                                   '--branch, --all and --merge'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   645
            return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   646
        if not (opts.get('source') or revs or
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   647
                opts.get('merge') or opts.get('branch')):
27322
84e85f461b79 transplant: use Oxford comma
timeless <timeless@mozdev.org>
parents: 27289
diff changeset
   648
            raise error.Abort(_('no source URL, branch revision, or revision '
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   649
                               'list provided'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   650
        if opts.get('all'):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   651
            if not opts.get('branch'):
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   652
                raise error.Abort(_('--all requires a branch revision'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   653
            if revs:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   654
                raise error.Abort(_('--all is incompatible with a '
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   655
                                   'revision list'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   656
36190
7fda2a8ed24e py3: use pycompat.{bytes|str}kwargs in transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36189
diff changeset
   657
    opts = pycompat.byteskwargs(opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   658
    checkopts(opts, revs)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   659
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   660
    if not opts.get('log'):
25828
5ae4b128a291 transplant: mark some undocumented options deprecated
Matt Mackall <mpm@selenic.com>
parents: 25695
diff changeset
   661
        # deprecated config: transplant.log
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   662
        opts['log'] = ui.config('transplant', 'log')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   663
    if not opts.get('filter'):
25828
5ae4b128a291 transplant: mark some undocumented options deprecated
Matt Mackall <mpm@selenic.com>
parents: 25695
diff changeset
   664
        # deprecated config: transplant.filter
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   665
        opts['filter'] = ui.config('transplant', 'filter')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   666
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20988
diff changeset
   667
    tp = transplanter(ui, repo, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   668
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   669
    p1, p2 = repo.dirstate.parents()
8176
2660e7002413 transplant: forbid transplant to nonempty repositories with no working directory.
Brendan Cully <brendan@kublai.com>
parents: 8173
diff changeset
   670
    if len(repo) > 0 and p1 == revlog.nullid:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   671
        raise error.Abort(_('no revision checked out'))
27677
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   672
    if opts.get('continue'):
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   673
        if not tp.canresume():
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   674
            raise error.Abort(_('no transplant to continue'))
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   675
    else:
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
   676
        cmdutil.checkunfinished(repo)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   677
        if p2 != revlog.nullid:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   678
            raise error.Abort(_('outstanding uncommitted merges'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   679
        m, a, r, d = repo.status()[:4]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   680
        if m or a or r or d:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
   681
            raise error.Abort(_('outstanding local changes'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   682
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   683
    sourcerepo = opts.get('source')
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   684
    if sourcerepo:
17874
2ba70eec1cf0 peer: subrepo isolation, pass repo instead of repo.ui to hg.peer
Simon Heimberg <simohe@besonet.ch>
parents: 17320
diff changeset
   685
        peer = hg.peer(repo, opts, ui.expandpath(sourcerepo))
38369
365a78daf735 py3: use pycompat.maplist() instead of map() in hgext/transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38164
diff changeset
   686
        heads = pycompat.maplist(peer.lookup, opts.get('branch', ()))
25679
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   687
        target = set(heads)
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   688
        for r in revs:
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   689
            try:
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   690
                target.add(peer.lookup(r))
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   691
            except error.RepoError:
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   692
                pass
17191
5884812686f7 peer: introduce peer methods to prepare for peer classes
Sune Foldager <cryo@cyanite.org>
parents: 17010
diff changeset
   693
        source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer,
25679
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
   694
                                    onlyheads=sorted(target), force=True)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   695
    else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   696
        source = repo
38369
365a78daf735 py3: use pycompat.maplist() instead of map() in hgext/transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38164
diff changeset
   697
        heads = pycompat.maplist(source.lookup, opts.get('branch', ()))
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   698
        cleanupfn = None
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   699
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   700
    try:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   701
        if opts.get('continue'):
3724
ea523d6f5f1a transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents: 3723
diff changeset
   702
            tp.resume(repo, source, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   703
            return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   704
10394
4612cded5176 fix coding style (reported by pylint)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10282
diff changeset
   705
        tf = tp.transplantfilter(repo, source, p1)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   706
        if opts.get('prune'):
37311
2a8939e25d07 transplant: avoid repo.lookup() for converting revnum to nodeid
Martin von Zweigbergk <martinvonz@google.com>
parents: 37120
diff changeset
   707
            prune = set(source[r].node()
19055
0fc41f88f148 transplant: use set for prune lookup
Mads Kiilerich <madski@unity3d.com>
parents: 19028
diff changeset
   708
                        for r in scmutil.revrange(source, opts.get('prune')))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   709
            matchfn = lambda x: tf(x) and x not in prune
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   710
        else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   711
            matchfn = tf
38369
365a78daf735 py3: use pycompat.maplist() instead of map() in hgext/transplant.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38164
diff changeset
   712
        merges = pycompat.maplist(source.lookup, opts.get('merge', ()))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   713
        revmap = {}
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   714
        if revs:
14319
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil
Matt Mackall <mpm@selenic.com>
parents: 14308
diff changeset
   715
            for r in scmutil.revrange(source, revs):
37311
2a8939e25d07 transplant: avoid repo.lookup() for converting revnum to nodeid
Martin von Zweigbergk <martinvonz@google.com>
parents: 37120
diff changeset
   716
                revmap[int(r)] = source[r].node()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   717
        elif opts.get('all') or not merges:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   718
            if source != repo:
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   719
                alltransplants = incwalk(source, csets, match=matchfn)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   720
            else:
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
   721
                alltransplants = transplantwalk(source, p1, heads,
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
   722
                                                match=matchfn)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   723
            if opts.get('all'):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   724
                revs = alltransplants
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   725
            else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   726
                revs, newmerges = browserevs(ui, source, alltransplants, opts)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   727
                merges.extend(newmerges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   728
            for r in revs:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   729
                revmap[source.changelog.rev(r)] = r
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   730
        for r in merges:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   731
            revmap[source.changelog.rev(r)] = r
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   732
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   733
        tp.apply(repo, source, revmap, merges, opts)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   734
    finally:
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   735
        if cleanupfn:
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
   736
            cleanupfn()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
   737
28394
dcb4209bd30d revset: replace extpredicate by revsetpredicate of registrar
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27840
diff changeset
   738
revsetpredicate = registrar.revsetpredicate()
27586
42910f9fffeb revset: use delayregistrar to register predicate in extension easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27344
diff changeset
   739
42910f9fffeb revset: use delayregistrar to register predicate in extension easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27344
diff changeset
   740
@revsetpredicate('transplanted([set])')
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
   741
def revsettransplanted(repo, subset, x):
27586
42910f9fffeb revset: use delayregistrar to register predicate in extension easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27344
diff changeset
   742
    """Transplanted changesets in set, or all transplanted changesets.
12822
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents: 12734
diff changeset
   743
    """
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
   744
    if x:
17299
e51d4aedace9 check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents: 17191
diff changeset
   745
        s = revset.getset(repo, subset, x)
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
   746
    else:
17299
e51d4aedace9 check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents: 17191
diff changeset
   747
        s = subset
31023
aea06029919e revset: import set classes directly from smartset module
Yuya Nishihara <yuya@tcha.org>
parents: 30925
diff changeset
   748
    return smartset.baseset([r for r in s if
20442
8524cdf66a12 hgext: updated extensions to return a baseset when adding symbols
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20269
diff changeset
   749
        repo[r].extra().get('transplant_source')])
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
   750
28540
012411b9940d hgext: use templatekeyword to mark a function as template keyword
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28481
diff changeset
   751
templatekeyword = registrar.templatekeyword()
012411b9940d hgext: use templatekeyword to mark a function as template keyword
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28481
diff changeset
   752
36514
7b74afec6772 templatekw: switch non-showlist template keywords to new API
Yuya Nishihara <yuya@tcha.org>
parents: 36229
diff changeset
   753
@templatekeyword('transplanted', requires={'ctx'})
7b74afec6772 templatekw: switch non-showlist template keywords to new API
Yuya Nishihara <yuya@tcha.org>
parents: 36229
diff changeset
   754
def kwtransplanted(context, mapping):
28540
012411b9940d hgext: use templatekeyword to mark a function as template keyword
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28481
diff changeset
   755
    """String. The node identifier of the transplanted
13689
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13607
diff changeset
   756
    changeset if any."""
36514
7b74afec6772 templatekw: switch non-showlist template keywords to new API
Yuya Nishihara <yuya@tcha.org>
parents: 36229
diff changeset
   757
    ctx = context.resource(mapping, 'ctx')
13689
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13607
diff changeset
   758
    n = ctx.extra().get('transplant_source')
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
   759
    return n and nodemod.hex(n) or ''
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
   760
12822
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents: 12734
diff changeset
   761
def extsetup(ui):
19480
7c0bb2b75aa8 transplant: add checkunfinished (issue3955)
Matt Mackall <mpm@selenic.com>
parents: 19055
diff changeset
   762
    cmdutil.unfinishedstates.append(
27678
b97004648028 transplant: specify the right file and path for unfinishedstates
timeless <timeless@mozdev.org>
parents: 27677
diff changeset
   763
        ['transplant/journal', True, False, _('transplant in progress'),
19480
7c0bb2b75aa8 transplant: add checkunfinished (issue3955)
Matt Mackall <mpm@selenic.com>
parents: 19055
diff changeset
   764
         _("use 'hg transplant --continue' or 'hg update' to abort")])
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
   765
12823
80deae3bc5ea hggettext: handle i18nfunctions declaration for docstrings translations
Patrick Mezard <pmezard@gmail.com>
parents: 12822
diff changeset
   766
# tell hggettext to extract docstrings from these functions:
13698
f30ce5983896 i18n: register new template keywords for translation
Patrick Mezard <pmezard@gmail.com>
parents: 13689
diff changeset
   767
i18nfunctions = [revsettransplanted, kwtransplanted]