annotate hgext/transplant.py @ 29879:b566c5992e07

histedit: move constraint verification to the 'action.verify' method Action has a method dedicated to verifying its validity. So we move code related to constrains into that method. This requires a bit more context to the 'verify' method in the same fashion we were passing the 'prev' argument. This is an extra step before we can simplify the constraint handling code further.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 26 Aug 2016 20:54:52 +0200
parents d5883fd055c6
children 82f1ef8b4477
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
19 import tempfile
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,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
27 match,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
28 merge,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
29 node as nodemod,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
30 patch,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
31 registrar,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
32 revlog,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
33 revset,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
34 scmutil,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
35 util,
ec75c94262a5 transplant: use absolute_import
timeless <timeless@mozdev.org>
parents: 28480
diff changeset
36 )
7629
97253bcb44a8 transplant: move docstrings before imports (see issue1466)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7415
diff changeset
37
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
38 class TransplantError(error.Abort):
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
39 pass
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
40
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
41 cmdtable = {}
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
42 command = cmdutil.command(cmdtable)
29841
d5883fd055c6 extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents: 28540
diff changeset
43 # 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
44 # 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
45 # 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
46 # leave the attribute unspecified.
29841
d5883fd055c6 extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents: 28540
diff changeset
47 testedwith = 'ships-with-hg-core'
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
48
8778
c5f36402daad use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8706
diff changeset
49 class transplantentry(object):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
50 def __init__(self, lnode, rnode):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
51 self.lnode = lnode
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
52 self.rnode = rnode
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
53
8778
c5f36402daad use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8706
diff changeset
54 class transplants(object):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
55 def __init__(self, path=None, transplantfile=None, opener=None):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
56 self.path = path
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
57 self.transplantfile = transplantfile
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
58 self.opener = opener
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
59
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
60 if not opener:
13970
d13913355390 move opener from util to scmutil
Adrian Buehlmann <adrian@cadifra.com>
parents: 13878
diff changeset
61 self.opener = scmutil.opener(self.path)
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
62 self.transplants = {}
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
63 self.dirty = False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
64 self.read()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
65
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
66 def read(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
67 abspath = os.path.join(self.path, self.transplantfile)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
68 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
69 for line in self.opener.read(self.transplantfile).splitlines():
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
70 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
71 list = self.transplants.setdefault(rnode, [])
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
72 list.append(transplantentry(lnode, rnode))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
73
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
74 def write(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
75 if self.dirty and self.transplantfile:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
76 if not os.path.isdir(self.path):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
77 os.mkdir(self.path)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
78 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
79 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
80 for t in list:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
81 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
82 fp.write(l + ':' + r + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
83 fp.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
84 self.dirty = False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
85
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
86 def get(self, rnode):
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
87 return self.transplants.get(rnode) or []
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
88
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
89 def set(self, lnode, rnode):
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
90 list = self.transplants.setdefault(rnode, [])
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
91 list.append(transplantentry(lnode, rnode))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
92 self.dirty = True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
93
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
94 def remove(self, transplant):
12313
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
95 list = self.transplants.get(transplant.rnode)
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
96 if list:
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
97 del list[list.index(transplant)]
2912881c2a98 transplant: maintain list of transplants in dict
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 12266
diff changeset
98 self.dirty = True
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
99
8778
c5f36402daad use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8706
diff changeset
100 class transplanter(object):
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20988
diff changeset
101 def __init__(self, ui, repo, opts):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
102 self.ui = ui
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
103 self.path = repo.join('transplant')
13970
d13913355390 move opener from util to scmutil
Adrian Buehlmann <adrian@cadifra.com>
parents: 13878
diff changeset
104 self.opener = scmutil.opener(self.path)
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
105 self.transplants = transplants(self.path, 'transplants',
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
106 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
107 def getcommiteditor():
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
108 editform = cmdutil.mergeeditform(repo[None], 'transplant')
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
109 return cmdutil.getcommiteditor(editform=editform, **opts)
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22006
diff changeset
110 self.getcommiteditor = getcommiteditor
3714
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 applied(self, repo, node, parent):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
113 '''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
114 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
115 if hasnode(repo, parent):
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
116 parentrev = repo.changelog.rev(parent)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
117 if hasnode(repo, node):
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
118 rev = repo.changelog.rev(node)
18082
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
119 reachable = repo.changelog.ancestors([parentrev], rev,
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
120 inclusive=True)
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
121 if rev in reachable:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
122 return True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
123 for t in self.transplants.get(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
124 # it might have been stripped
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
125 if not hasnode(repo, t.lnode):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
126 self.transplants.remove(t)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
127 return False
17010
a6c64211acdb transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com>
parents: 17009
diff changeset
128 lnoderev = repo.changelog.rev(t.lnode)
18082
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
129 if lnoderev in repo.changelog.ancestors([parentrev], lnoderev,
40f0c0748cfc transplant: replace incancestors uses with ancestors
Siddharth Agarwal <sid0@fb.com>
parents: 17874
diff changeset
130 inclusive=True):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
131 return True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
132 return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
133
26346
2449a0a6ebda transplant: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25879
diff changeset
134 def apply(self, repo, source, revmap, merges, opts=None):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
135 '''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
136 if opts is None:
2449a0a6ebda transplant: remove a mutable default argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25879
diff changeset
137 opts = {}
8209
a1a5a57efe90 replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents: 8176
diff changeset
138 revs = sorted(revmap)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
139 p1, p2 = repo.dirstate.parents()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
140 pulls = []
23452
86c0d8c1484f transplant: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 23270
diff changeset
141 diffopts = patch.difffeatureopts(self.ui, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
142 diffopts.git = True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
143
27289
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
144 lock = tr = None
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
145 try:
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
146 lock = repo.lock()
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
147 tr = repo.transaction('transplant')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
148 for rev in revs:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
149 node = revmap[rev]
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
150 revstr = '%s:%s' % (rev, nodemod.short(node))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
151
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
152 if self.applied(repo, node, p1):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
153 self.ui.warn(_('skipping already applied revision %s\n') %
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
154 revstr)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
155 continue
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
156
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
157 parents = source.changelog.parents(node)
16627
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16551
diff changeset
158 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
159 # If the changeset parent is the same as the
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
160 # wdir's parent, just pull it.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
161 if parents[0] == p1:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
162 pulls.append(node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
163 p1 = node
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
164 continue
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
165 if pulls:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
166 if source != repo:
22699
74da54e52d7c transplant: use exchange.pull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22252
diff changeset
167 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
168 merge.update(repo, pulls[-1], False, False)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
169 p1, p2 = repo.dirstate.parents()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
170 pulls = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
171
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
172 domerge = False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
173 if node in merges:
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
174 # 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
175 # couldn't transplant after the latest even if
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
176 # transplants before them fail.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
177 domerge = True
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
178 if not hasnode(repo, node):
22699
74da54e52d7c transplant: use exchange.pull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22252
diff changeset
179 exchange.pull(repo, source.peer(), heads=[node])
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
180
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
181 skipmerge = False
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
182 if parents[1] != revlog.nullid:
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
183 if not opts.get('parent'):
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
184 self.ui.note(_('skipping merge changeset %s:%s\n')
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
185 % (rev, nodemod.short(node)))
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
186 skipmerge = True
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
187 else:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
188 parent = source.lookup(opts['parent'])
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
189 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
190 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
191 (nodemod.short(parent),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
192 nodemod.short(node)))
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
193 else:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
194 parent = parents[0]
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
195
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
196 if skipmerge:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
197 patchfile = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
198 else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
199 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
200 fp = os.fdopen(fd, 'w')
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
201 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
202 for chunk in gen:
b6f5490effbf patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7280
diff changeset
203 fp.write(chunk)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
204 fp.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
205
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
206 del revmap[rev]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
207 if patchfile or domerge:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
208 try:
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
209 try:
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
210 n = self.applyone(repo, node,
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
211 source.changelog.read(node),
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
212 patchfile, merge=domerge,
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
213 log=opts.get('log'),
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
214 filter=opts.get('filter'))
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
215 except TransplantError:
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
216 # 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
217 # fix the merge or cancel everything
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
218 tr.close()
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16457
diff changeset
219 raise
4251
e76e52145c3d transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents: 4072
diff changeset
220 if n and domerge:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
221 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
222 nodemod.short(n)))
4251
e76e52145c3d transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents: 4072
diff changeset
223 elif n:
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
224 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
225 % (nodemod.short(node),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
226 nodemod.short(n)))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
227 finally:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
228 if patchfile:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
229 os.unlink(patchfile)
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
230 tr.close()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
231 if pulls:
22699
74da54e52d7c transplant: use exchange.pull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22252
diff changeset
232 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
233 merge.update(repo, pulls[-1], False, False)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
234 finally:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
235 self.saveseries(revmap, merges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
236 self.transplants.write()
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
237 if tr:
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14741
diff changeset
238 tr.release()
25879
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25828
diff changeset
239 if lock:
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25828
diff changeset
240 lock.release()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
241
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
242 def filter(self, filter, node, changelog, patchfile):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
243 '''arbitrarily rewrite changeset before applying it'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
244
6966
057ced2b8543 i18n: mark strings for translation in transplant extension
Martin Geisler <mg@daimi.au.dk>
parents: 6762
diff changeset
245 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
246 user, date, msg = (changelog[1], changelog[2], changelog[4])
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
247 fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-')
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
248 fp = os.fdopen(fd, 'w')
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
249 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
250 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
251 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
252 fp.write(msg + '\n')
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
253 fp.close()
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
254
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
255 try:
23270
41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter
Yuya Nishihara <yuya@tcha.org>
parents: 22699
diff changeset
256 self.ui.system('%s %s %s' % (filter, util.shellquote(headerfile),
41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter
Yuya Nishihara <yuya@tcha.org>
parents: 22699
diff changeset
257 util.shellquote(patchfile)),
41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter
Yuya Nishihara <yuya@tcha.org>
parents: 22699
diff changeset
258 environ={'HGUSER': changelog[1],
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
259 '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
260 },
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
261 onerr=error.Abort, errprefix=_('filter failed'))
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
262 user, date, msg = self.parselog(file(headerfile))[1:4]
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
263 finally:
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
264 os.unlink(headerfile)
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
265
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
266 return (user, date, msg)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
267
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
268 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
269 filter=None):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
270 '''apply the patch in patchfile to the repository as a transplant'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
271 (manifest, user, (time, timezone), files, message) = cl[:5]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
272 date = "%d %d" % (time, timezone)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
273 extra = {'transplant_source': node}
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
274 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
275 (user, date, message) = self.filter(filter, node, cl, patchfile)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
276
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
277 if log:
9183
d0225fa2f6c4 do not translate commit messages
Martin Geisler <mg@lazybytes.net>
parents: 8934
diff changeset
278 # 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
279 message += '\n(transplanted from %s)' % nodemod.hex(node)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
280
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
281 self.ui.status(_('applying %s\n') % nodemod.short(node))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
282 self.ui.note('%s %s\n%s\n' % (user, date, message))
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
283
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
284 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
285 raise error.Abort(_('can only omit patchfile if merging'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
286 if patchfile:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
287 try:
14564
65f4512e40e4 patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com>
parents: 14556
diff changeset
288 files = set()
14382
2d16f15da7bd patch: remove patch.patch() cwd argument
Patrick Mezard <pmezard@gmail.com>
parents: 14319
diff changeset
289 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
290 files = list(files)
25660
328739ea70c3 global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents: 25186
diff changeset
291 except Exception as inst:
3757
faed44bab17b transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents: 3752
diff changeset
292 seriespath = os.path.join(self.path, 'series')
faed44bab17b transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents: 3752
diff changeset
293 if os.path.exists(seriespath):
faed44bab17b transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents: 3752
diff changeset
294 os.unlink(seriespath)
13878
a8d13ee0ce68 misc: replace .parents()[0] with p1()
Matt Mackall <mpm@selenic.com>
parents: 13790
diff changeset
295 p1 = repo.dirstate.p1()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
296 p2 = node
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
297 self.log(user, date, message, p1, p2, merge=merge)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
298 self.ui.write(str(inst) + '\n')
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27586
diff changeset
299 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
300 'hg transplant --continue'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
301 else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
302 files = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
303 if merge:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
304 p1, p2 = repo.dirstate.parents()
16551
ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407)
Patrick Mezard <patrick@mezard.eu>
parents: 16507
diff changeset
305 repo.setparents(p1, node)
8703
8676dd819444 transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents: 8615
diff changeset
306 m = match.always(repo.root, '')
8676dd819444 transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents: 8615
diff changeset
307 else:
8676dd819444 transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents: 8615
diff changeset
308 m = match.exact(repo.root, '', files)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
309
15220
f7db54b832af transplant: add --edit option
Matt Mackall <mpm@selenic.com>
parents: 15204
diff changeset
310 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
311 editor=self.getcommiteditor())
11638
79231258503b transplant: crash if repo.commit() finds nothing to commit
Greg Ward <greg-hg@gerg.ca>
parents: 11411
diff changeset
312 if not n:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
313 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
314 nodemod.short(node))
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17299
diff changeset
315 return None
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
316 if not merge:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
317 self.transplants.set(n, node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
318
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
319 return n
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
320
27677
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
321 def canresume(self):
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
322 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
323
18919
cdf764a2f7a5 repoview: remove unreachable code
Bryan O'Sullivan <bryano@fb.com>
parents: 18082
diff changeset
324 def resume(self, repo, source, opts):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
325 '''recover last transaction and apply remaining changesets'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
326 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
327 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
328 if n:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
329 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
330 (nodemod.short(node),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
331 nodemod.short(n)))
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
332 else:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
333 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
334 % (nodemod.short(node),))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
335 seriespath = os.path.join(self.path, 'series')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
336 if not os.path.exists(seriespath):
3758
889f7e74a0d9 transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents: 3757
diff changeset
337 self.transplants.write()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
338 return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
339 nodes, merges = self.readseries()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
340 revmap = {}
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
341 for n in nodes:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
342 revmap[source.changelog.rev(n)] = n
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
343 os.unlink(seriespath)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
344
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
345 self.apply(repo, source, revmap, merges, opts)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
346
18926
8deaa703a622 transplant: pass source through to recover
Bryan O'Sullivan <bryano@fb.com>
parents: 18919
diff changeset
347 def recover(self, repo, source, opts):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
348 '''commit working directory using journal metadata'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
349 node, user, date, message, parents = self.readlog()
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
350 merge = False
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
351
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
352 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
353 raise error.Abort(_('transplant log file is corrupt'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
354
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
355 parent = parents[0]
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
356 if len(parents) > 1:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
357 if opts.get('parent'):
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
358 parent = source.lookup(opts['parent'])
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
359 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
360 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
361 (nodemod.short(parent),
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
362 nodemod.short(node)))
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
363 else:
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
364 merge = True
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
365
3758
889f7e74a0d9 transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents: 3757
diff changeset
366 extra = {'transplant_source': node}
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
367 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
368 p1, p2 = repo.dirstate.parents()
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
369 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
370 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
371 '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
372 if merge:
16551
ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407)
Patrick Mezard <patrick@mezard.eu>
parents: 16507
diff changeset
373 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
374 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
375 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
376 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
377 editor=self.getcommiteditor())
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
378 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
379 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
380 if not merge:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
381 self.transplants.set(n, node)
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
382 else:
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
383 n = None
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
384 self.unlog()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
385
4915
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
386 return n, node
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents: 4680
diff changeset
387 finally:
27289
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
388 # 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
389 # 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
390 pass
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
391
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
392 def readseries(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
393 nodes = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
394 merges = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
395 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
396 for line in self.opener.read('series').splitlines():
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
397 if line.startswith('# Merges'):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
398 cur = merges
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
399 continue
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
400 cur.append(revlog.bin(line))
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
401
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
402 return (nodes, merges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
403
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
404 def saveseries(self, revmap, merges):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
405 if not revmap:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
406 return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
407
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
408 if not os.path.isdir(self.path):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
409 os.mkdir(self.path)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
410 series = self.opener('series', 'w')
8209
a1a5a57efe90 replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents: 8176
diff changeset
411 for rev in sorted(revmap):
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
412 series.write(nodemod.hex(revmap[rev]) + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
413 if merges:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
414 series.write('# Merges\n')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
415 for m in merges:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
416 series.write(nodemod.hex(m) + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
417 series.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
418
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
419 def parselog(self, fp):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
420 parents = []
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
421 message = []
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
422 node = revlog.nullid
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
423 inmsg = False
13789
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13742
diff changeset
424 user = None
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13742
diff changeset
425 date = None
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
426 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
427 if inmsg:
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
428 message.append(line)
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
429 elif line.startswith('# User '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
430 user = line[7:]
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
431 elif line.startswith('# Date '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
432 date = line[7:]
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
433 elif line.startswith('# Node ID '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
434 node = revlog.bin(line[10:])
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
435 elif line.startswith('# Parent '):
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
436 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
437 elif not line.startswith('# '):
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
438 inmsg = True
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
439 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
440 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
441 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
442 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
443
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
444 def log(self, user, date, message, p1, p2, merge=False):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
445 '''journal changelog metadata for later recover'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
446
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
447 if not os.path.isdir(self.path):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
448 os.mkdir(self.path)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
449 fp = self.opener('journal', 'w')
3725
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
450 fp.write('# User %s\n' % user)
ccc7a9eb0e5e transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents: 3724
diff changeset
451 fp.write('# Date %s\n' % date)
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
452 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
453 fp.write('# Parent ' + nodemod.hex(p1) + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
454 if merge:
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
455 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
456 fp.write(message.rstrip() + '\n')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
457 fp.close()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
458
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
459 def readlog(self):
3759
e96f97ca0358 transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents: 3758
diff changeset
460 return self.parselog(self.opener('journal'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
461
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
462 def unlog(self):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
463 '''remove changelog journal'''
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
464 absdst = os.path.join(self.path, 'journal')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
465 if os.path.exists(absdst):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
466 os.unlink(absdst)
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 def transplantfilter(self, repo, source, root):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
469 def matchfn(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
470 if self.applied(repo, node, root):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
471 return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
472 if source.changelog.parents(node)[1] != revlog.nullid:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
473 return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
474 extra = source.changelog.read(node)[5]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
475 cnode = extra.get('transplant_source')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
476 if cnode and self.applied(repo, cnode, root):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
477 return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
478 return True
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 return matchfn
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
481
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
482 def hasnode(repo, node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
483 try:
13031
3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons
Martin Geisler <mg@aragost.com>
parents: 12823
diff changeset
484 return repo.changelog.rev(node) is not None
7633
08cabecfa8a8 errors: move revlog errors
Matt Mackall <mpm@selenic.com>
parents: 7629
diff changeset
485 except error.RevlogError:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
486 return False
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
487
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
488 def browserevs(ui, repo, nodes, opts):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
489 '''interactively transplant changesets'''
3723
c828fca6f38a transplant: show_changeset moved to cmdutil
Brendan Cully <brendan@kublai.com>
parents: 3714
diff changeset
490 displayer = cmdutil.show_changeset(ui, repo, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
491 transplants = []
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
492 merges = []
20268
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
493 prompt = _('apply changeset? [ynmpcq?]:'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
494 '$$ &yes, transplant this changeset'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
495 '$$ &no, skip this changeset'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
496 '$$ &merge at this changeset'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
497 '$$ show &patch'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
498 '$$ &commit selected changesets'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
499 '$$ &quit and cancel transplant'
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
500 '$$ &? (show this help)')
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
501 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
502 displayer.show(repo[node])
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
503 action = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
504 while not action:
20268
27d3f1fe42ac transplant: use "ui.promptchoice()" for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
505 action = 'ynmpcq?'[ui.promptchoice(prompt)]
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
506 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
507 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
508 ui.write('%s: %s\n' % (c, t))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
509 action = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
510 elif action == 'p':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
511 parent = repo.changelog.parents(node)[0]
7308
b6f5490effbf patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7280
diff changeset
512 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
513 ui.write(chunk)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
514 action = None
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
515 if action == 'y':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
516 transplants.append(node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
517 elif action == 'm':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
518 merges.append(node)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
519 elif action == 'c':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
520 break
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
521 elif action == 'q':
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
522 transplants = ()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
523 merges = ()
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
524 break
10152
56284451a22c Added support for templatevar "footer" to cmdutil.py
Robert Bachmann <rbachm@gmail.com>
parents: 9995
diff changeset
525 displayer.close()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
526 return (transplants, merges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
527
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
528 @command('transplant',
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
529 [('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
530 ('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
531 ('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
532 ('p', 'prune', [], _('skip over REV'), _('REV')),
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
533 ('m', 'merge', [], _('merge at REV'), _('REV')),
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
534 ('', 'parent', '',
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
535 _('parent to choose when transplanting merge'), _('REV')),
15220
f7db54b832af transplant: add --edit option
Matt Mackall <mpm@selenic.com>
parents: 15204
diff changeset
536 ('e', 'edit', False, _('invoke editor on commit messages')),
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
537 ('', 'log', None, _('append transplant info to log message')),
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
538 ('c', 'continue', None, _('continue last transplant session '
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
539 'after fixing conflicts')),
14308
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
540 ('', 'filter', '',
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
541 _('filter changesets through command'), _('CMD'))],
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
542 _('hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] '
e7ea3e38fea8 transplant: use cmdutil.command decorator
Adrian Buehlmann <adrian@cadifra.com>
parents: 14260
diff changeset
543 '[-m REV] [REV]...'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
544 def transplant(ui, repo, *revs, **opts):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
545 '''transplant changesets from another branch
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
546
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
547 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
548 directory with the log of the original changeset. The changesets
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
549 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
550 identities.
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
551
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
552 Consider using the graft command if everything is inside the same
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
553 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
554 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
555 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
556
888ec2650c2d transplant: explain that changesets are copied, not moved
Martin Geisler <mg@lazybytes.net>
parents: 13031
diff changeset
557 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
558 of the form::
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
559
9200
6b4c527c3d22 transplant: better reST formatting
Martin Geisler <mg@lazybytes.net>
parents: 9196
diff changeset
560 (transplanted from CHANGESETHASH)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
561
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
562 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
563 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
564 $1 and the patch as $2.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
565
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
566 --source/-s specifies another repository to use for selecting changesets,
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
567 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
568 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
569 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
570 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
571 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
572 with --branch will be transplanted.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
573
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
574 Example:
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
575
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
576 - 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
577
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
578 hg transplant --branch REV --all
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
579
8000
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
580 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
581 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
582 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
583 normally instead of transplanting them.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
584
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15220
diff changeset
585 Merge changesets may be transplanted directly by specifying the
16457
91196ebcaeed transplant: remove extraneous whitespace
Steven Stallion <sstallion@gmail.com>
parents: 16400
diff changeset
586 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
587
11193
687c7d395f20 Use our custom hg reStructuredText role some more
Martin Geisler <mg@aragost.com>
parents: 10510
diff changeset
588 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
589 start an interactive changeset browser.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
590
8000
83d7c9cfb065 transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents: 7874
diff changeset
591 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
592 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
593 --continue/-c`.
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
594 '''
27840
dc237afacbd4 with: use context manager for wlock in transplant
Bryan O'Sullivan <bryano@fb.com>
parents: 27678
diff changeset
595 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
596 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
597
ee33e677f0ac transplant: widen wlock scope of transplant for consitency while processing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 26587
diff changeset
598 def _dotransplant(ui, repo, *revs, **opts):
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
599 def incwalk(repo, csets, match=util.always):
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
600 for node in csets:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
601 if match(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
602 yield node
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
603
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
604 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
605 '''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
606 of dest.
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
607 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
608 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
609 heads = repo.heads()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
610 ancestors = []
20988
8c2f1e2a11ff transplant: use context ancestor instead of changelog ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 20442
diff changeset
611 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
612 for head in heads:
20988
8c2f1e2a11ff transplant: use context ancestor instead of changelog ancestor
Mads Kiilerich <madski@unity3d.com>
parents: 20442
diff changeset
613 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
614 for node in repo.changelog.nodesbetween(ancestors, heads)[0]:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
615 if match(node):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
616 yield node
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
617
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
618 def checkopts(opts, revs):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
619 if opts.get('continue'):
10282
08a0f04b56bd many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents: 10264
diff changeset
620 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
621 raise error.Abort(_('--continue is incompatible with '
19028
b512934988d4 transplant: improve documentation
Mads Kiilerich <madski@unity3d.com>
parents: 19027
diff changeset
622 '--branch, --all and --merge'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
623 return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
624 if not (opts.get('source') or revs or
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
625 opts.get('merge') or opts.get('branch')):
27322
84e85f461b79 transplant: use Oxford comma
timeless <timeless@mozdev.org>
parents: 27289
diff changeset
626 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
627 'list provided'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
628 if opts.get('all'):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
629 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
630 raise error.Abort(_('--all requires a branch revision'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
631 if revs:
26587
56b2bcea2529 error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26578
diff changeset
632 raise error.Abort(_('--all is incompatible with a '
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
633 'revision list'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
634
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
635 checkopts(opts, revs)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
636
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
637 if not opts.get('log'):
25828
5ae4b128a291 transplant: mark some undocumented options deprecated
Matt Mackall <mpm@selenic.com>
parents: 25695
diff changeset
638 # deprecated config: transplant.log
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
639 opts['log'] = ui.config('transplant', 'log')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
640 if not opts.get('filter'):
25828
5ae4b128a291 transplant: mark some undocumented options deprecated
Matt Mackall <mpm@selenic.com>
parents: 25695
diff changeset
641 # deprecated config: transplant.filter
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
642 opts['filter'] = ui.config('transplant', 'filter')
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
643
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20988
diff changeset
644 tp = transplanter(ui, repo, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
645
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
646 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
647 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
648 raise error.Abort(_('no revision checked out'))
27677
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
649 if opts.get('continue'):
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
650 if not tp.canresume():
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
651 raise error.Abort(_('no transplant to continue'))
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
652 else:
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
653 cmdutil.checkunfinished(repo)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
654 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
655 raise error.Abort(_('outstanding uncommitted merges'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
656 m, a, r, d = repo.status()[:4]
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
657 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
658 raise error.Abort(_('outstanding local changes'))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
659
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
660 sourcerepo = opts.get('source')
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
661 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
662 peer = hg.peer(repo, opts, ui.expandpath(sourcerepo))
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
663 heads = map(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
664 target = set(heads)
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
665 for r in revs:
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
666 try:
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
667 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
668 except error.RepoError:
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24365
diff changeset
669 pass
17191
5884812686f7 peer: introduce peer methods to prepare for peer classes
Sune Foldager <cryo@cyanite.org>
parents: 17010
diff changeset
670 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
671 onlyheads=sorted(target), force=True)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
672 else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
673 source = repo
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
674 heads = map(source.lookup, opts.get('branch', ()))
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
675 cleanupfn = None
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
676
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
677 try:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
678 if opts.get('continue'):
3724
ea523d6f5f1a transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents: 3723
diff changeset
679 tp.resume(repo, source, opts)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
680 return
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
681
10394
4612cded5176 fix coding style (reported by pylint)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 10282
diff changeset
682 tf = tp.transplantfilter(repo, source, p1)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
683 if opts.get('prune'):
19055
0fc41f88f148 transplant: use set for prune lookup
Mads Kiilerich <madski@unity3d.com>
parents: 19028
diff changeset
684 prune = set(source.lookup(r)
0fc41f88f148 transplant: use set for prune lookup
Mads Kiilerich <madski@unity3d.com>
parents: 19028
diff changeset
685 for r in scmutil.revrange(source, opts.get('prune')))
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
686 matchfn = lambda x: tf(x) and x not in prune
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
687 else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
688 matchfn = tf
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
689 merges = map(source.lookup, opts.get('merge', ()))
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
690 revmap = {}
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
691 if revs:
14319
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil
Matt Mackall <mpm@selenic.com>
parents: 14308
diff changeset
692 for r in scmutil.revrange(source, revs):
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
693 revmap[int(r)] = source.lookup(r)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
694 elif opts.get('all') or not merges:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
695 if source != repo:
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
696 alltransplants = incwalk(source, csets, match=matchfn)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
697 else:
19027
3f5fac4b1cfa transplant: clarify what --branch do - it has nothing to do with branches
Mads Kiilerich <madski@unity3d.com>
parents: 18926
diff changeset
698 alltransplants = transplantwalk(source, p1, heads,
7744
b44dbb95f07f transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents: 7633
diff changeset
699 match=matchfn)
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
700 if opts.get('all'):
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
701 revs = alltransplants
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
702 else:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
703 revs, newmerges = browserevs(ui, source, alltransplants, opts)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
704 merges.extend(newmerges)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
705 for r in revs:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
706 revmap[source.changelog.rev(r)] = r
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
707 for r in merges:
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
708 revmap[source.changelog.rev(r)] = r
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
709
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
710 tp.apply(repo, source, revmap, merges, opts)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
711 finally:
14161
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
712 if cleanupfn:
8a0fca925992 bundlerepo: fix and improve getremotechanges
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
713 cleanupfn()
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
714
28394
dcb4209bd30d revset: replace extpredicate by revsetpredicate of registrar
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27840
diff changeset
715 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
716
42910f9fffeb revset: use delayregistrar to register predicate in extension easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 27344
diff changeset
717 @revsetpredicate('transplanted([set])')
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
718 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
719 """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
720 """
12581
19dabc8a3236 transplant: add the transplanted revset predicate
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
parents: 12349
diff changeset
721 if x:
17299
e51d4aedace9 check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents: 17191
diff changeset
722 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
723 else:
17299
e51d4aedace9 check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents: 17191
diff changeset
724 s = subset
20442
8524cdf66a12 hgext: updated extensions to return a baseset when adding symbols
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20269
diff changeset
725 return revset.baseset([r for r in s if
8524cdf66a12 hgext: updated extensions to return a baseset when adding symbols
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20269
diff changeset
726 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
727
28540
012411b9940d hgext: use templatekeyword to mark a function as template keyword
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28481
diff changeset
728 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
729
012411b9940d hgext: use templatekeyword to mark a function as template keyword
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28481
diff changeset
730 @templatekeyword('transplanted')
13689
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13607
diff changeset
731 def kwtransplanted(repo, ctx, **args):
28540
012411b9940d hgext: use templatekeyword to mark a function as template keyword
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28481
diff changeset
732 """String. The node identifier of the transplanted
13689
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13607
diff changeset
733 changeset if any."""
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13607
diff changeset
734 n = ctx.extra().get('transplant_source')
28480
db171c6a1697 transplant: switch to using nodemod for hex+short
timeless <timeless@mozdev.org>
parents: 28394
diff changeset
735 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
736
12822
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents: 12734
diff changeset
737 def extsetup(ui):
19480
7c0bb2b75aa8 transplant: add checkunfinished (issue3955)
Matt Mackall <mpm@selenic.com>
parents: 19055
diff changeset
738 cmdutil.unfinishedstates.append(
27678
b97004648028 transplant: specify the right file and path for unfinishedstates
timeless <timeless@mozdev.org>
parents: 27677
diff changeset
739 ['transplant/journal', True, False, _('transplant in progress'),
19480
7c0bb2b75aa8 transplant: add checkunfinished (issue3955)
Matt Mackall <mpm@selenic.com>
parents: 19055
diff changeset
740 _("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
741
12823
80deae3bc5ea hggettext: handle i18nfunctions declaration for docstrings translations
Patrick Mezard <pmezard@gmail.com>
parents: 12822
diff changeset
742 # 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
743 i18nfunctions = [revsettransplanted, kwtransplanted]