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