Show More
@@ -1,3194 +1,3194 b'' | |||||
1 | # mq.py - patch queues for mercurial |
|
1 | # mq.py - patch queues for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005, 2006 Chris Mason <mason@suse.com> |
|
3 | # Copyright 2005, 2006 Chris Mason <mason@suse.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | '''manage a stack of patches |
|
8 | '''manage a stack of patches | |
9 |
|
9 | |||
10 | This extension lets you work with a stack of patches in a Mercurial |
|
10 | This extension lets you work with a stack of patches in a Mercurial | |
11 | repository. It manages two stacks of patches - all known patches, and |
|
11 | repository. It manages two stacks of patches - all known patches, and | |
12 | applied patches (subset of known patches). |
|
12 | applied patches (subset of known patches). | |
13 |
|
13 | |||
14 | Known patches are represented as patch files in the .hg/patches |
|
14 | Known patches are represented as patch files in the .hg/patches | |
15 | directory. Applied patches are both patch files and changesets. |
|
15 | directory. Applied patches are both patch files and changesets. | |
16 |
|
16 | |||
17 | Common tasks (use :hg:`help command` for more details):: |
|
17 | Common tasks (use :hg:`help command` for more details):: | |
18 |
|
18 | |||
19 | create new patch qnew |
|
19 | create new patch qnew | |
20 | import existing patch qimport |
|
20 | import existing patch qimport | |
21 |
|
21 | |||
22 | print patch series qseries |
|
22 | print patch series qseries | |
23 | print applied patches qapplied |
|
23 | print applied patches qapplied | |
24 |
|
24 | |||
25 | add known patch to applied stack qpush |
|
25 | add known patch to applied stack qpush | |
26 | remove patch from applied stack qpop |
|
26 | remove patch from applied stack qpop | |
27 | refresh contents of top applied patch qrefresh |
|
27 | refresh contents of top applied patch qrefresh | |
28 |
|
28 | |||
29 | By default, mq will automatically use git patches when required to |
|
29 | By default, mq will automatically use git patches when required to | |
30 | avoid losing file mode changes, copy records, binary files or empty |
|
30 | avoid losing file mode changes, copy records, binary files or empty | |
31 | files creations or deletions. This behaviour can be configured with:: |
|
31 | files creations or deletions. This behaviour can be configured with:: | |
32 |
|
32 | |||
33 | [mq] |
|
33 | [mq] | |
34 | git = auto/keep/yes/no |
|
34 | git = auto/keep/yes/no | |
35 |
|
35 | |||
36 | If set to 'keep', mq will obey the [diff] section configuration while |
|
36 | If set to 'keep', mq will obey the [diff] section configuration while | |
37 | preserving existing git patches upon qrefresh. If set to 'yes' or |
|
37 | preserving existing git patches upon qrefresh. If set to 'yes' or | |
38 | 'no', mq will override the [diff] section and always generate git or |
|
38 | 'no', mq will override the [diff] section and always generate git or | |
39 | regular patches, possibly losing data in the second case. |
|
39 | regular patches, possibly losing data in the second case. | |
40 |
|
40 | |||
41 | You will by default be managing a patch queue named "patches". You can |
|
41 | You will by default be managing a patch queue named "patches". You can | |
42 | create other, independent patch queues with the :hg:`qqueue` command. |
|
42 | create other, independent patch queues with the :hg:`qqueue` command. | |
43 | ''' |
|
43 | ''' | |
44 |
|
44 | |||
45 | from mercurial.i18n import _ |
|
45 | from mercurial.i18n import _ | |
46 | from mercurial.node import bin, hex, short, nullid, nullrev |
|
46 | from mercurial.node import bin, hex, short, nullid, nullrev | |
47 | from mercurial.lock import release |
|
47 | from mercurial.lock import release | |
48 | from mercurial import commands, cmdutil, hg, patch, util |
|
48 | from mercurial import commands, cmdutil, hg, patch, util | |
49 | from mercurial import repair, extensions, url, error |
|
49 | from mercurial import repair, extensions, url, error | |
50 | import os, sys, re, errno, shutil |
|
50 | import os, sys, re, errno, shutil | |
51 |
|
51 | |||
52 | commands.norepo += " qclone" |
|
52 | commands.norepo += " qclone" | |
53 |
|
53 | |||
54 | # Patch names looks like unix-file names. |
|
54 | # Patch names looks like unix-file names. | |
55 | # They must be joinable with queue directory and result in the patch path. |
|
55 | # They must be joinable with queue directory and result in the patch path. | |
56 | normname = util.normpath |
|
56 | normname = util.normpath | |
57 |
|
57 | |||
58 | class statusentry(object): |
|
58 | class statusentry(object): | |
59 | def __init__(self, node, name): |
|
59 | def __init__(self, node, name): | |
60 | self.node, self.name = node, name |
|
60 | self.node, self.name = node, name | |
61 | def __repr__(self): |
|
61 | def __repr__(self): | |
62 | return hex(self.node) + ':' + self.name |
|
62 | return hex(self.node) + ':' + self.name | |
63 |
|
63 | |||
64 | class patchheader(object): |
|
64 | class patchheader(object): | |
65 | def __init__(self, pf, plainmode=False): |
|
65 | def __init__(self, pf, plainmode=False): | |
66 | def eatdiff(lines): |
|
66 | def eatdiff(lines): | |
67 | while lines: |
|
67 | while lines: | |
68 | l = lines[-1] |
|
68 | l = lines[-1] | |
69 | if (l.startswith("diff -") or |
|
69 | if (l.startswith("diff -") or | |
70 | l.startswith("Index:") or |
|
70 | l.startswith("Index:") or | |
71 | l.startswith("===========")): |
|
71 | l.startswith("===========")): | |
72 | del lines[-1] |
|
72 | del lines[-1] | |
73 | else: |
|
73 | else: | |
74 | break |
|
74 | break | |
75 | def eatempty(lines): |
|
75 | def eatempty(lines): | |
76 | while lines: |
|
76 | while lines: | |
77 | if not lines[-1].strip(): |
|
77 | if not lines[-1].strip(): | |
78 | del lines[-1] |
|
78 | del lines[-1] | |
79 | else: |
|
79 | else: | |
80 | break |
|
80 | break | |
81 |
|
81 | |||
82 | message = [] |
|
82 | message = [] | |
83 | comments = [] |
|
83 | comments = [] | |
84 | user = None |
|
84 | user = None | |
85 | date = None |
|
85 | date = None | |
86 | parent = None |
|
86 | parent = None | |
87 | format = None |
|
87 | format = None | |
88 | subject = None |
|
88 | subject = None | |
89 | diffstart = 0 |
|
89 | diffstart = 0 | |
90 |
|
90 | |||
91 | for line in file(pf): |
|
91 | for line in file(pf): | |
92 | line = line.rstrip() |
|
92 | line = line.rstrip() | |
93 | if (line.startswith('diff --git') |
|
93 | if (line.startswith('diff --git') | |
94 | or (diffstart and line.startswith('+++ '))): |
|
94 | or (diffstart and line.startswith('+++ '))): | |
95 | diffstart = 2 |
|
95 | diffstart = 2 | |
96 | break |
|
96 | break | |
97 | diffstart = 0 # reset |
|
97 | diffstart = 0 # reset | |
98 | if line.startswith("--- "): |
|
98 | if line.startswith("--- "): | |
99 | diffstart = 1 |
|
99 | diffstart = 1 | |
100 | continue |
|
100 | continue | |
101 | elif format == "hgpatch": |
|
101 | elif format == "hgpatch": | |
102 | # parse values when importing the result of an hg export |
|
102 | # parse values when importing the result of an hg export | |
103 | if line.startswith("# User "): |
|
103 | if line.startswith("# User "): | |
104 | user = line[7:] |
|
104 | user = line[7:] | |
105 | elif line.startswith("# Date "): |
|
105 | elif line.startswith("# Date "): | |
106 | date = line[7:] |
|
106 | date = line[7:] | |
107 | elif line.startswith("# Parent "): |
|
107 | elif line.startswith("# Parent "): | |
108 | parent = line[9:] |
|
108 | parent = line[9:] | |
109 | elif not line.startswith("# ") and line: |
|
109 | elif not line.startswith("# ") and line: | |
110 | message.append(line) |
|
110 | message.append(line) | |
111 | format = None |
|
111 | format = None | |
112 | elif line == '# HG changeset patch': |
|
112 | elif line == '# HG changeset patch': | |
113 | message = [] |
|
113 | message = [] | |
114 | format = "hgpatch" |
|
114 | format = "hgpatch" | |
115 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
115 | elif (format != "tagdone" and (line.startswith("Subject: ") or | |
116 | line.startswith("subject: "))): |
|
116 | line.startswith("subject: "))): | |
117 | subject = line[9:] |
|
117 | subject = line[9:] | |
118 | format = "tag" |
|
118 | format = "tag" | |
119 | elif (format != "tagdone" and (line.startswith("From: ") or |
|
119 | elif (format != "tagdone" and (line.startswith("From: ") or | |
120 | line.startswith("from: "))): |
|
120 | line.startswith("from: "))): | |
121 | user = line[6:] |
|
121 | user = line[6:] | |
122 | format = "tag" |
|
122 | format = "tag" | |
123 | elif (format != "tagdone" and (line.startswith("Date: ") or |
|
123 | elif (format != "tagdone" and (line.startswith("Date: ") or | |
124 | line.startswith("date: "))): |
|
124 | line.startswith("date: "))): | |
125 | date = line[6:] |
|
125 | date = line[6:] | |
126 | format = "tag" |
|
126 | format = "tag" | |
127 | elif format == "tag" and line == "": |
|
127 | elif format == "tag" and line == "": | |
128 | # when looking for tags (subject: from: etc) they |
|
128 | # when looking for tags (subject: from: etc) they | |
129 | # end once you find a blank line in the source |
|
129 | # end once you find a blank line in the source | |
130 | format = "tagdone" |
|
130 | format = "tagdone" | |
131 | elif message or line: |
|
131 | elif message or line: | |
132 | message.append(line) |
|
132 | message.append(line) | |
133 | comments.append(line) |
|
133 | comments.append(line) | |
134 |
|
134 | |||
135 | eatdiff(message) |
|
135 | eatdiff(message) | |
136 | eatdiff(comments) |
|
136 | eatdiff(comments) | |
137 | eatempty(message) |
|
137 | eatempty(message) | |
138 | eatempty(comments) |
|
138 | eatempty(comments) | |
139 |
|
139 | |||
140 | # make sure message isn't empty |
|
140 | # make sure message isn't empty | |
141 | if format and format.startswith("tag") and subject: |
|
141 | if format and format.startswith("tag") and subject: | |
142 | message.insert(0, "") |
|
142 | message.insert(0, "") | |
143 | message.insert(0, subject) |
|
143 | message.insert(0, subject) | |
144 |
|
144 | |||
145 | self.message = message |
|
145 | self.message = message | |
146 | self.comments = comments |
|
146 | self.comments = comments | |
147 | self.user = user |
|
147 | self.user = user | |
148 | self.date = date |
|
148 | self.date = date | |
149 | self.parent = parent |
|
149 | self.parent = parent | |
150 | self.haspatch = diffstart > 1 |
|
150 | self.haspatch = diffstart > 1 | |
151 | self.plainmode = plainmode |
|
151 | self.plainmode = plainmode | |
152 |
|
152 | |||
153 | def setuser(self, user): |
|
153 | def setuser(self, user): | |
154 | if not self.updateheader(['From: ', '# User '], user): |
|
154 | if not self.updateheader(['From: ', '# User '], user): | |
155 | try: |
|
155 | try: | |
156 | patchheaderat = self.comments.index('# HG changeset patch') |
|
156 | patchheaderat = self.comments.index('# HG changeset patch') | |
157 | self.comments.insert(patchheaderat + 1, '# User ' + user) |
|
157 | self.comments.insert(patchheaderat + 1, '# User ' + user) | |
158 | except ValueError: |
|
158 | except ValueError: | |
159 | if self.plainmode or self._hasheader(['Date: ']): |
|
159 | if self.plainmode or self._hasheader(['Date: ']): | |
160 | self.comments = ['From: ' + user] + self.comments |
|
160 | self.comments = ['From: ' + user] + self.comments | |
161 | else: |
|
161 | else: | |
162 | tmp = ['# HG changeset patch', '# User ' + user, ''] |
|
162 | tmp = ['# HG changeset patch', '# User ' + user, ''] | |
163 | self.comments = tmp + self.comments |
|
163 | self.comments = tmp + self.comments | |
164 | self.user = user |
|
164 | self.user = user | |
165 |
|
165 | |||
166 | def setdate(self, date): |
|
166 | def setdate(self, date): | |
167 | if not self.updateheader(['Date: ', '# Date '], date): |
|
167 | if not self.updateheader(['Date: ', '# Date '], date): | |
168 | try: |
|
168 | try: | |
169 | patchheaderat = self.comments.index('# HG changeset patch') |
|
169 | patchheaderat = self.comments.index('# HG changeset patch') | |
170 | self.comments.insert(patchheaderat + 1, '# Date ' + date) |
|
170 | self.comments.insert(patchheaderat + 1, '# Date ' + date) | |
171 | except ValueError: |
|
171 | except ValueError: | |
172 | if self.plainmode or self._hasheader(['From: ']): |
|
172 | if self.plainmode or self._hasheader(['From: ']): | |
173 | self.comments = ['Date: ' + date] + self.comments |
|
173 | self.comments = ['Date: ' + date] + self.comments | |
174 | else: |
|
174 | else: | |
175 | tmp = ['# HG changeset patch', '# Date ' + date, ''] |
|
175 | tmp = ['# HG changeset patch', '# Date ' + date, ''] | |
176 | self.comments = tmp + self.comments |
|
176 | self.comments = tmp + self.comments | |
177 | self.date = date |
|
177 | self.date = date | |
178 |
|
178 | |||
179 | def setparent(self, parent): |
|
179 | def setparent(self, parent): | |
180 | if not self.updateheader(['# Parent '], parent): |
|
180 | if not self.updateheader(['# Parent '], parent): | |
181 | try: |
|
181 | try: | |
182 | patchheaderat = self.comments.index('# HG changeset patch') |
|
182 | patchheaderat = self.comments.index('# HG changeset patch') | |
183 | self.comments.insert(patchheaderat + 1, '# Parent ' + parent) |
|
183 | self.comments.insert(patchheaderat + 1, '# Parent ' + parent) | |
184 | except ValueError: |
|
184 | except ValueError: | |
185 | pass |
|
185 | pass | |
186 | self.parent = parent |
|
186 | self.parent = parent | |
187 |
|
187 | |||
188 | def setmessage(self, message): |
|
188 | def setmessage(self, message): | |
189 | if self.comments: |
|
189 | if self.comments: | |
190 | self._delmsg() |
|
190 | self._delmsg() | |
191 | self.message = [message] |
|
191 | self.message = [message] | |
192 | self.comments += self.message |
|
192 | self.comments += self.message | |
193 |
|
193 | |||
194 | def updateheader(self, prefixes, new): |
|
194 | def updateheader(self, prefixes, new): | |
195 | '''Update all references to a field in the patch header. |
|
195 | '''Update all references to a field in the patch header. | |
196 | Return whether the field is present.''' |
|
196 | Return whether the field is present.''' | |
197 | res = False |
|
197 | res = False | |
198 | for prefix in prefixes: |
|
198 | for prefix in prefixes: | |
199 | for i in xrange(len(self.comments)): |
|
199 | for i in xrange(len(self.comments)): | |
200 | if self.comments[i].startswith(prefix): |
|
200 | if self.comments[i].startswith(prefix): | |
201 | self.comments[i] = prefix + new |
|
201 | self.comments[i] = prefix + new | |
202 | res = True |
|
202 | res = True | |
203 | break |
|
203 | break | |
204 | return res |
|
204 | return res | |
205 |
|
205 | |||
206 | def _hasheader(self, prefixes): |
|
206 | def _hasheader(self, prefixes): | |
207 | '''Check if a header starts with any of the given prefixes.''' |
|
207 | '''Check if a header starts with any of the given prefixes.''' | |
208 | for prefix in prefixes: |
|
208 | for prefix in prefixes: | |
209 | for comment in self.comments: |
|
209 | for comment in self.comments: | |
210 | if comment.startswith(prefix): |
|
210 | if comment.startswith(prefix): | |
211 | return True |
|
211 | return True | |
212 | return False |
|
212 | return False | |
213 |
|
213 | |||
214 | def __str__(self): |
|
214 | def __str__(self): | |
215 | if not self.comments: |
|
215 | if not self.comments: | |
216 | return '' |
|
216 | return '' | |
217 | return '\n'.join(self.comments) + '\n\n' |
|
217 | return '\n'.join(self.comments) + '\n\n' | |
218 |
|
218 | |||
219 | def _delmsg(self): |
|
219 | def _delmsg(self): | |
220 | '''Remove existing message, keeping the rest of the comments fields. |
|
220 | '''Remove existing message, keeping the rest of the comments fields. | |
221 | If comments contains 'subject: ', message will prepend |
|
221 | If comments contains 'subject: ', message will prepend | |
222 | the field and a blank line.''' |
|
222 | the field and a blank line.''' | |
223 | if self.message: |
|
223 | if self.message: | |
224 | subj = 'subject: ' + self.message[0].lower() |
|
224 | subj = 'subject: ' + self.message[0].lower() | |
225 | for i in xrange(len(self.comments)): |
|
225 | for i in xrange(len(self.comments)): | |
226 | if subj == self.comments[i].lower(): |
|
226 | if subj == self.comments[i].lower(): | |
227 | del self.comments[i] |
|
227 | del self.comments[i] | |
228 | self.message = self.message[2:] |
|
228 | self.message = self.message[2:] | |
229 | break |
|
229 | break | |
230 | ci = 0 |
|
230 | ci = 0 | |
231 | for mi in self.message: |
|
231 | for mi in self.message: | |
232 | while mi != self.comments[ci]: |
|
232 | while mi != self.comments[ci]: | |
233 | ci += 1 |
|
233 | ci += 1 | |
234 | del self.comments[ci] |
|
234 | del self.comments[ci] | |
235 |
|
235 | |||
236 | class queue(object): |
|
236 | class queue(object): | |
237 | def __init__(self, ui, path, patchdir=None): |
|
237 | def __init__(self, ui, path, patchdir=None): | |
238 | self.basepath = path |
|
238 | self.basepath = path | |
239 | try: |
|
239 | try: | |
240 | fh = open(os.path.join(path, 'patches.queue')) |
|
240 | fh = open(os.path.join(path, 'patches.queue')) | |
241 | cur = fh.read().rstrip() |
|
241 | cur = fh.read().rstrip() | |
242 | if not cur: |
|
242 | if not cur: | |
243 | curpath = os.path.join(path, 'patches') |
|
243 | curpath = os.path.join(path, 'patches') | |
244 | else: |
|
244 | else: | |
245 | curpath = os.path.join(path, 'patches-' + cur) |
|
245 | curpath = os.path.join(path, 'patches-' + cur) | |
246 | except IOError: |
|
246 | except IOError: | |
247 | curpath = os.path.join(path, 'patches') |
|
247 | curpath = os.path.join(path, 'patches') | |
248 | self.path = patchdir or curpath |
|
248 | self.path = patchdir or curpath | |
249 | self.opener = util.opener(self.path) |
|
249 | self.opener = util.opener(self.path) | |
250 | self.ui = ui |
|
250 | self.ui = ui | |
251 | self.applied_dirty = 0 |
|
251 | self.applied_dirty = 0 | |
252 | self.series_dirty = 0 |
|
252 | self.series_dirty = 0 | |
253 | self.added = [] |
|
253 | self.added = [] | |
254 | self.series_path = "series" |
|
254 | self.series_path = "series" | |
255 | self.status_path = "status" |
|
255 | self.status_path = "status" | |
256 | self.guards_path = "guards" |
|
256 | self.guards_path = "guards" | |
257 | self.active_guards = None |
|
257 | self.active_guards = None | |
258 | self.guards_dirty = False |
|
258 | self.guards_dirty = False | |
259 | # Handle mq.git as a bool with extended values |
|
259 | # Handle mq.git as a bool with extended values | |
260 | try: |
|
260 | try: | |
261 | gitmode = ui.configbool('mq', 'git', None) |
|
261 | gitmode = ui.configbool('mq', 'git', None) | |
262 | if gitmode is None: |
|
262 | if gitmode is None: | |
263 | raise error.ConfigError() |
|
263 | raise error.ConfigError() | |
264 | self.gitmode = gitmode and 'yes' or 'no' |
|
264 | self.gitmode = gitmode and 'yes' or 'no' | |
265 | except error.ConfigError: |
|
265 | except error.ConfigError: | |
266 | self.gitmode = ui.config('mq', 'git', 'auto').lower() |
|
266 | self.gitmode = ui.config('mq', 'git', 'auto').lower() | |
267 | self.plainmode = ui.configbool('mq', 'plain', False) |
|
267 | self.plainmode = ui.configbool('mq', 'plain', False) | |
268 |
|
268 | |||
269 | @util.propertycache |
|
269 | @util.propertycache | |
270 | def applied(self): |
|
270 | def applied(self): | |
271 | if os.path.exists(self.join(self.status_path)): |
|
271 | if os.path.exists(self.join(self.status_path)): | |
272 | def parse(l): |
|
272 | def parse(l): | |
273 | n, name = l.split(':', 1) |
|
273 | n, name = l.split(':', 1) | |
274 | return statusentry(bin(n), name) |
|
274 | return statusentry(bin(n), name) | |
275 | lines = self.opener(self.status_path).read().splitlines() |
|
275 | lines = self.opener(self.status_path).read().splitlines() | |
276 | return [parse(l) for l in lines] |
|
276 | return [parse(l) for l in lines] | |
277 | return [] |
|
277 | return [] | |
278 |
|
278 | |||
279 | @util.propertycache |
|
279 | @util.propertycache | |
280 | def full_series(self): |
|
280 | def full_series(self): | |
281 | if os.path.exists(self.join(self.series_path)): |
|
281 | if os.path.exists(self.join(self.series_path)): | |
282 | return self.opener(self.series_path).read().splitlines() |
|
282 | return self.opener(self.series_path).read().splitlines() | |
283 | return [] |
|
283 | return [] | |
284 |
|
284 | |||
285 | @util.propertycache |
|
285 | @util.propertycache | |
286 | def series(self): |
|
286 | def series(self): | |
287 | self.parse_series() |
|
287 | self.parse_series() | |
288 | return self.series |
|
288 | return self.series | |
289 |
|
289 | |||
290 | @util.propertycache |
|
290 | @util.propertycache | |
291 | def series_guards(self): |
|
291 | def series_guards(self): | |
292 | self.parse_series() |
|
292 | self.parse_series() | |
293 | return self.series_guards |
|
293 | return self.series_guards | |
294 |
|
294 | |||
295 | def invalidate(self): |
|
295 | def invalidate(self): | |
296 | for a in 'applied full_series series series_guards'.split(): |
|
296 | for a in 'applied full_series series series_guards'.split(): | |
297 | if a in self.__dict__: |
|
297 | if a in self.__dict__: | |
298 | delattr(self, a) |
|
298 | delattr(self, a) | |
299 | self.applied_dirty = 0 |
|
299 | self.applied_dirty = 0 | |
300 | self.series_dirty = 0 |
|
300 | self.series_dirty = 0 | |
301 | self.guards_dirty = False |
|
301 | self.guards_dirty = False | |
302 | self.active_guards = None |
|
302 | self.active_guards = None | |
303 |
|
303 | |||
304 | def diffopts(self, opts={}, patchfn=None): |
|
304 | def diffopts(self, opts={}, patchfn=None): | |
305 | diffopts = patch.diffopts(self.ui, opts) |
|
305 | diffopts = patch.diffopts(self.ui, opts) | |
306 | if self.gitmode == 'auto': |
|
306 | if self.gitmode == 'auto': | |
307 | diffopts.upgrade = True |
|
307 | diffopts.upgrade = True | |
308 | elif self.gitmode == 'keep': |
|
308 | elif self.gitmode == 'keep': | |
309 | pass |
|
309 | pass | |
310 | elif self.gitmode in ('yes', 'no'): |
|
310 | elif self.gitmode in ('yes', 'no'): | |
311 | diffopts.git = self.gitmode == 'yes' |
|
311 | diffopts.git = self.gitmode == 'yes' | |
312 | else: |
|
312 | else: | |
313 | raise util.Abort(_('mq.git option can be auto/keep/yes/no' |
|
313 | raise util.Abort(_('mq.git option can be auto/keep/yes/no' | |
314 | ' got %s') % self.gitmode) |
|
314 | ' got %s') % self.gitmode) | |
315 | if patchfn: |
|
315 | if patchfn: | |
316 | diffopts = self.patchopts(diffopts, patchfn) |
|
316 | diffopts = self.patchopts(diffopts, patchfn) | |
317 | return diffopts |
|
317 | return diffopts | |
318 |
|
318 | |||
319 | def patchopts(self, diffopts, *patches): |
|
319 | def patchopts(self, diffopts, *patches): | |
320 | """Return a copy of input diff options with git set to true if |
|
320 | """Return a copy of input diff options with git set to true if | |
321 | referenced patch is a git patch and should be preserved as such. |
|
321 | referenced patch is a git patch and should be preserved as such. | |
322 | """ |
|
322 | """ | |
323 | diffopts = diffopts.copy() |
|
323 | diffopts = diffopts.copy() | |
324 | if not diffopts.git and self.gitmode == 'keep': |
|
324 | if not diffopts.git and self.gitmode == 'keep': | |
325 | for patchfn in patches: |
|
325 | for patchfn in patches: | |
326 | patchf = self.opener(patchfn, 'r') |
|
326 | patchf = self.opener(patchfn, 'r') | |
327 | # if the patch was a git patch, refresh it as a git patch |
|
327 | # if the patch was a git patch, refresh it as a git patch | |
328 | for line in patchf: |
|
328 | for line in patchf: | |
329 | if line.startswith('diff --git'): |
|
329 | if line.startswith('diff --git'): | |
330 | diffopts.git = True |
|
330 | diffopts.git = True | |
331 | break |
|
331 | break | |
332 | patchf.close() |
|
332 | patchf.close() | |
333 | return diffopts |
|
333 | return diffopts | |
334 |
|
334 | |||
335 | def join(self, *p): |
|
335 | def join(self, *p): | |
336 | return os.path.join(self.path, *p) |
|
336 | return os.path.join(self.path, *p) | |
337 |
|
337 | |||
338 | def find_series(self, patch): |
|
338 | def find_series(self, patch): | |
339 | def matchpatch(l): |
|
339 | def matchpatch(l): | |
340 | l = l.split('#', 1)[0] |
|
340 | l = l.split('#', 1)[0] | |
341 | return l.strip() == patch |
|
341 | return l.strip() == patch | |
342 | for index, l in enumerate(self.full_series): |
|
342 | for index, l in enumerate(self.full_series): | |
343 | if matchpatch(l): |
|
343 | if matchpatch(l): | |
344 | return index |
|
344 | return index | |
345 | return None |
|
345 | return None | |
346 |
|
346 | |||
347 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
347 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') | |
348 |
|
348 | |||
349 | def parse_series(self): |
|
349 | def parse_series(self): | |
350 | self.series = [] |
|
350 | self.series = [] | |
351 | self.series_guards = [] |
|
351 | self.series_guards = [] | |
352 | for l in self.full_series: |
|
352 | for l in self.full_series: | |
353 | h = l.find('#') |
|
353 | h = l.find('#') | |
354 | if h == -1: |
|
354 | if h == -1: | |
355 | patch = l |
|
355 | patch = l | |
356 | comment = '' |
|
356 | comment = '' | |
357 | elif h == 0: |
|
357 | elif h == 0: | |
358 | continue |
|
358 | continue | |
359 | else: |
|
359 | else: | |
360 | patch = l[:h] |
|
360 | patch = l[:h] | |
361 | comment = l[h:] |
|
361 | comment = l[h:] | |
362 | patch = patch.strip() |
|
362 | patch = patch.strip() | |
363 | if patch: |
|
363 | if patch: | |
364 | if patch in self.series: |
|
364 | if patch in self.series: | |
365 | raise util.Abort(_('%s appears more than once in %s') % |
|
365 | raise util.Abort(_('%s appears more than once in %s') % | |
366 | (patch, self.join(self.series_path))) |
|
366 | (patch, self.join(self.series_path))) | |
367 | self.series.append(patch) |
|
367 | self.series.append(patch) | |
368 | self.series_guards.append(self.guard_re.findall(comment)) |
|
368 | self.series_guards.append(self.guard_re.findall(comment)) | |
369 |
|
369 | |||
370 | def check_guard(self, guard): |
|
370 | def check_guard(self, guard): | |
371 | if not guard: |
|
371 | if not guard: | |
372 | return _('guard cannot be an empty string') |
|
372 | return _('guard cannot be an empty string') | |
373 | bad_chars = '# \t\r\n\f' |
|
373 | bad_chars = '# \t\r\n\f' | |
374 | first = guard[0] |
|
374 | first = guard[0] | |
375 | if first in '-+': |
|
375 | if first in '-+': | |
376 | return (_('guard %r starts with invalid character: %r') % |
|
376 | return (_('guard %r starts with invalid character: %r') % | |
377 | (guard, first)) |
|
377 | (guard, first)) | |
378 | for c in bad_chars: |
|
378 | for c in bad_chars: | |
379 | if c in guard: |
|
379 | if c in guard: | |
380 | return _('invalid character in guard %r: %r') % (guard, c) |
|
380 | return _('invalid character in guard %r: %r') % (guard, c) | |
381 |
|
381 | |||
382 | def set_active(self, guards): |
|
382 | def set_active(self, guards): | |
383 | for guard in guards: |
|
383 | for guard in guards: | |
384 | bad = self.check_guard(guard) |
|
384 | bad = self.check_guard(guard) | |
385 | if bad: |
|
385 | if bad: | |
386 | raise util.Abort(bad) |
|
386 | raise util.Abort(bad) | |
387 | guards = sorted(set(guards)) |
|
387 | guards = sorted(set(guards)) | |
388 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) |
|
388 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) | |
389 | self.active_guards = guards |
|
389 | self.active_guards = guards | |
390 | self.guards_dirty = True |
|
390 | self.guards_dirty = True | |
391 |
|
391 | |||
392 | def active(self): |
|
392 | def active(self): | |
393 | if self.active_guards is None: |
|
393 | if self.active_guards is None: | |
394 | self.active_guards = [] |
|
394 | self.active_guards = [] | |
395 | try: |
|
395 | try: | |
396 | guards = self.opener(self.guards_path).read().split() |
|
396 | guards = self.opener(self.guards_path).read().split() | |
397 | except IOError, err: |
|
397 | except IOError, err: | |
398 | if err.errno != errno.ENOENT: |
|
398 | if err.errno != errno.ENOENT: | |
399 | raise |
|
399 | raise | |
400 | guards = [] |
|
400 | guards = [] | |
401 | for i, guard in enumerate(guards): |
|
401 | for i, guard in enumerate(guards): | |
402 | bad = self.check_guard(guard) |
|
402 | bad = self.check_guard(guard) | |
403 | if bad: |
|
403 | if bad: | |
404 | self.ui.warn('%s:%d: %s\n' % |
|
404 | self.ui.warn('%s:%d: %s\n' % | |
405 | (self.join(self.guards_path), i + 1, bad)) |
|
405 | (self.join(self.guards_path), i + 1, bad)) | |
406 | else: |
|
406 | else: | |
407 | self.active_guards.append(guard) |
|
407 | self.active_guards.append(guard) | |
408 | return self.active_guards |
|
408 | return self.active_guards | |
409 |
|
409 | |||
410 | def set_guards(self, idx, guards): |
|
410 | def set_guards(self, idx, guards): | |
411 | for g in guards: |
|
411 | for g in guards: | |
412 | if len(g) < 2: |
|
412 | if len(g) < 2: | |
413 | raise util.Abort(_('guard %r too short') % g) |
|
413 | raise util.Abort(_('guard %r too short') % g) | |
414 | if g[0] not in '-+': |
|
414 | if g[0] not in '-+': | |
415 | raise util.Abort(_('guard %r starts with invalid char') % g) |
|
415 | raise util.Abort(_('guard %r starts with invalid char') % g) | |
416 | bad = self.check_guard(g[1:]) |
|
416 | bad = self.check_guard(g[1:]) | |
417 | if bad: |
|
417 | if bad: | |
418 | raise util.Abort(bad) |
|
418 | raise util.Abort(bad) | |
419 | drop = self.guard_re.sub('', self.full_series[idx]) |
|
419 | drop = self.guard_re.sub('', self.full_series[idx]) | |
420 | self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) |
|
420 | self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) | |
421 | self.parse_series() |
|
421 | self.parse_series() | |
422 | self.series_dirty = True |
|
422 | self.series_dirty = True | |
423 |
|
423 | |||
424 | def pushable(self, idx): |
|
424 | def pushable(self, idx): | |
425 | if isinstance(idx, str): |
|
425 | if isinstance(idx, str): | |
426 | idx = self.series.index(idx) |
|
426 | idx = self.series.index(idx) | |
427 | patchguards = self.series_guards[idx] |
|
427 | patchguards = self.series_guards[idx] | |
428 | if not patchguards: |
|
428 | if not patchguards: | |
429 | return True, None |
|
429 | return True, None | |
430 | guards = self.active() |
|
430 | guards = self.active() | |
431 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] |
|
431 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] | |
432 | if exactneg: |
|
432 | if exactneg: | |
433 | return False, exactneg[0] |
|
433 | return False, exactneg[0] | |
434 | pos = [g for g in patchguards if g[0] == '+'] |
|
434 | pos = [g for g in patchguards if g[0] == '+'] | |
435 | exactpos = [g for g in pos if g[1:] in guards] |
|
435 | exactpos = [g for g in pos if g[1:] in guards] | |
436 | if pos: |
|
436 | if pos: | |
437 | if exactpos: |
|
437 | if exactpos: | |
438 | return True, exactpos[0] |
|
438 | return True, exactpos[0] | |
439 | return False, pos |
|
439 | return False, pos | |
440 | return True, '' |
|
440 | return True, '' | |
441 |
|
441 | |||
442 | def explain_pushable(self, idx, all_patches=False): |
|
442 | def explain_pushable(self, idx, all_patches=False): | |
443 | write = all_patches and self.ui.write or self.ui.warn |
|
443 | write = all_patches and self.ui.write or self.ui.warn | |
444 | if all_patches or self.ui.verbose: |
|
444 | if all_patches or self.ui.verbose: | |
445 | if isinstance(idx, str): |
|
445 | if isinstance(idx, str): | |
446 | idx = self.series.index(idx) |
|
446 | idx = self.series.index(idx) | |
447 | pushable, why = self.pushable(idx) |
|
447 | pushable, why = self.pushable(idx) | |
448 | if all_patches and pushable: |
|
448 | if all_patches and pushable: | |
449 | if why is None: |
|
449 | if why is None: | |
450 | write(_('allowing %s - no guards in effect\n') % |
|
450 | write(_('allowing %s - no guards in effect\n') % | |
451 | self.series[idx]) |
|
451 | self.series[idx]) | |
452 | else: |
|
452 | else: | |
453 | if not why: |
|
453 | if not why: | |
454 | write(_('allowing %s - no matching negative guards\n') % |
|
454 | write(_('allowing %s - no matching negative guards\n') % | |
455 | self.series[idx]) |
|
455 | self.series[idx]) | |
456 | else: |
|
456 | else: | |
457 | write(_('allowing %s - guarded by %r\n') % |
|
457 | write(_('allowing %s - guarded by %r\n') % | |
458 | (self.series[idx], why)) |
|
458 | (self.series[idx], why)) | |
459 | if not pushable: |
|
459 | if not pushable: | |
460 | if why: |
|
460 | if why: | |
461 | write(_('skipping %s - guarded by %r\n') % |
|
461 | write(_('skipping %s - guarded by %r\n') % | |
462 | (self.series[idx], why)) |
|
462 | (self.series[idx], why)) | |
463 | else: |
|
463 | else: | |
464 | write(_('skipping %s - no matching guards\n') % |
|
464 | write(_('skipping %s - no matching guards\n') % | |
465 | self.series[idx]) |
|
465 | self.series[idx]) | |
466 |
|
466 | |||
467 | def save_dirty(self): |
|
467 | def save_dirty(self): | |
468 | def write_list(items, path): |
|
468 | def write_list(items, path): | |
469 | fp = self.opener(path, 'w') |
|
469 | fp = self.opener(path, 'w') | |
470 | for i in items: |
|
470 | for i in items: | |
471 | fp.write("%s\n" % i) |
|
471 | fp.write("%s\n" % i) | |
472 | fp.close() |
|
472 | fp.close() | |
473 | if self.applied_dirty: |
|
473 | if self.applied_dirty: | |
474 | write_list(map(str, self.applied), self.status_path) |
|
474 | write_list(map(str, self.applied), self.status_path) | |
475 | if self.series_dirty: |
|
475 | if self.series_dirty: | |
476 | write_list(self.full_series, self.series_path) |
|
476 | write_list(self.full_series, self.series_path) | |
477 | if self.guards_dirty: |
|
477 | if self.guards_dirty: | |
478 | write_list(self.active_guards, self.guards_path) |
|
478 | write_list(self.active_guards, self.guards_path) | |
479 | if self.added: |
|
479 | if self.added: | |
480 | qrepo = self.qrepo() |
|
480 | qrepo = self.qrepo() | |
481 | if qrepo: |
|
481 | if qrepo: | |
482 | qrepo[None].add(f for f in self.added if f not in qrepo[None]) |
|
482 | qrepo[None].add(f for f in self.added if f not in qrepo[None]) | |
483 | self.added = [] |
|
483 | self.added = [] | |
484 |
|
484 | |||
485 | def removeundo(self, repo): |
|
485 | def removeundo(self, repo): | |
486 | undo = repo.sjoin('undo') |
|
486 | undo = repo.sjoin('undo') | |
487 | if not os.path.exists(undo): |
|
487 | if not os.path.exists(undo): | |
488 | return |
|
488 | return | |
489 | try: |
|
489 | try: | |
490 | os.unlink(undo) |
|
490 | os.unlink(undo) | |
491 | except OSError, inst: |
|
491 | except OSError, inst: | |
492 | self.ui.warn(_('error removing undo: %s\n') % str(inst)) |
|
492 | self.ui.warn(_('error removing undo: %s\n') % str(inst)) | |
493 |
|
493 | |||
494 | def printdiff(self, repo, diffopts, node1, node2=None, files=None, |
|
494 | def printdiff(self, repo, diffopts, node1, node2=None, files=None, | |
495 | fp=None, changes=None, opts={}): |
|
495 | fp=None, changes=None, opts={}): | |
496 | stat = opts.get('stat') |
|
496 | stat = opts.get('stat') | |
497 | m = cmdutil.match(repo, files, opts) |
|
497 | m = cmdutil.match(repo, files, opts) | |
498 | cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, |
|
498 | cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, | |
499 | changes, stat, fp) |
|
499 | changes, stat, fp) | |
500 |
|
500 | |||
501 | def mergeone(self, repo, mergeq, head, patch, rev, diffopts): |
|
501 | def mergeone(self, repo, mergeq, head, patch, rev, diffopts): | |
502 | # first try just applying the patch |
|
502 | # first try just applying the patch | |
503 | (err, n) = self.apply(repo, [patch], update_status=False, |
|
503 | (err, n) = self.apply(repo, [patch], update_status=False, | |
504 | strict=True, merge=rev) |
|
504 | strict=True, merge=rev) | |
505 |
|
505 | |||
506 | if err == 0: |
|
506 | if err == 0: | |
507 | return (err, n) |
|
507 | return (err, n) | |
508 |
|
508 | |||
509 | if n is None: |
|
509 | if n is None: | |
510 | raise util.Abort(_("apply failed for patch %s") % patch) |
|
510 | raise util.Abort(_("apply failed for patch %s") % patch) | |
511 |
|
511 | |||
512 | self.ui.warn(_("patch didn't work out, merging %s\n") % patch) |
|
512 | self.ui.warn(_("patch didn't work out, merging %s\n") % patch) | |
513 |
|
513 | |||
514 | # apply failed, strip away that rev and merge. |
|
514 | # apply failed, strip away that rev and merge. | |
515 | hg.clean(repo, head) |
|
515 | hg.clean(repo, head) | |
516 | self.strip(repo, [n], update=False, backup='strip') |
|
516 | self.strip(repo, [n], update=False, backup='strip') | |
517 |
|
517 | |||
518 | ctx = repo[rev] |
|
518 | ctx = repo[rev] | |
519 | ret = hg.merge(repo, rev) |
|
519 | ret = hg.merge(repo, rev) | |
520 | if ret: |
|
520 | if ret: | |
521 | raise util.Abort(_("update returned %d") % ret) |
|
521 | raise util.Abort(_("update returned %d") % ret) | |
522 | n = repo.commit(ctx.description(), ctx.user(), force=True) |
|
522 | n = repo.commit(ctx.description(), ctx.user(), force=True) | |
523 | if n is None: |
|
523 | if n is None: | |
524 | raise util.Abort(_("repo commit failed")) |
|
524 | raise util.Abort(_("repo commit failed")) | |
525 | try: |
|
525 | try: | |
526 | ph = patchheader(mergeq.join(patch), self.plainmode) |
|
526 | ph = patchheader(mergeq.join(patch), self.plainmode) | |
527 | except: |
|
527 | except: | |
528 | raise util.Abort(_("unable to read %s") % patch) |
|
528 | raise util.Abort(_("unable to read %s") % patch) | |
529 |
|
529 | |||
530 | diffopts = self.patchopts(diffopts, patch) |
|
530 | diffopts = self.patchopts(diffopts, patch) | |
531 | patchf = self.opener(patch, "w") |
|
531 | patchf = self.opener(patch, "w") | |
532 | comments = str(ph) |
|
532 | comments = str(ph) | |
533 | if comments: |
|
533 | if comments: | |
534 | patchf.write(comments) |
|
534 | patchf.write(comments) | |
535 | self.printdiff(repo, diffopts, head, n, fp=patchf) |
|
535 | self.printdiff(repo, diffopts, head, n, fp=patchf) | |
536 | patchf.close() |
|
536 | patchf.close() | |
537 | self.removeundo(repo) |
|
537 | self.removeundo(repo) | |
538 | return (0, n) |
|
538 | return (0, n) | |
539 |
|
539 | |||
540 | def qparents(self, repo, rev=None): |
|
540 | def qparents(self, repo, rev=None): | |
541 | if rev is None: |
|
541 | if rev is None: | |
542 | (p1, p2) = repo.dirstate.parents() |
|
542 | (p1, p2) = repo.dirstate.parents() | |
543 | if p2 == nullid: |
|
543 | if p2 == nullid: | |
544 | return p1 |
|
544 | return p1 | |
545 | if not self.applied: |
|
545 | if not self.applied: | |
546 | return None |
|
546 | return None | |
547 | return self.applied[-1].node |
|
547 | return self.applied[-1].node | |
548 | p1, p2 = repo.changelog.parents(rev) |
|
548 | p1, p2 = repo.changelog.parents(rev) | |
549 | if p2 != nullid and p2 in [x.node for x in self.applied]: |
|
549 | if p2 != nullid and p2 in [x.node for x in self.applied]: | |
550 | return p2 |
|
550 | return p2 | |
551 | return p1 |
|
551 | return p1 | |
552 |
|
552 | |||
553 | def mergepatch(self, repo, mergeq, series, diffopts): |
|
553 | def mergepatch(self, repo, mergeq, series, diffopts): | |
554 | if not self.applied: |
|
554 | if not self.applied: | |
555 | # each of the patches merged in will have two parents. This |
|
555 | # each of the patches merged in will have two parents. This | |
556 | # can confuse the qrefresh, qdiff, and strip code because it |
|
556 | # can confuse the qrefresh, qdiff, and strip code because it | |
557 | # needs to know which parent is actually in the patch queue. |
|
557 | # needs to know which parent is actually in the patch queue. | |
558 | # so, we insert a merge marker with only one parent. This way |
|
558 | # so, we insert a merge marker with only one parent. This way | |
559 | # the first patch in the queue is never a merge patch |
|
559 | # the first patch in the queue is never a merge patch | |
560 | # |
|
560 | # | |
561 | pname = ".hg.patches.merge.marker" |
|
561 | pname = ".hg.patches.merge.marker" | |
562 | n = repo.commit('[mq]: merge marker', force=True) |
|
562 | n = repo.commit('[mq]: merge marker', force=True) | |
563 | self.removeundo(repo) |
|
563 | self.removeundo(repo) | |
564 | self.applied.append(statusentry(n, pname)) |
|
564 | self.applied.append(statusentry(n, pname)) | |
565 | self.applied_dirty = 1 |
|
565 | self.applied_dirty = 1 | |
566 |
|
566 | |||
567 | head = self.qparents(repo) |
|
567 | head = self.qparents(repo) | |
568 |
|
568 | |||
569 | for patch in series: |
|
569 | for patch in series: | |
570 | patch = mergeq.lookup(patch, strict=True) |
|
570 | patch = mergeq.lookup(patch, strict=True) | |
571 | if not patch: |
|
571 | if not patch: | |
572 | self.ui.warn(_("patch %s does not exist\n") % patch) |
|
572 | self.ui.warn(_("patch %s does not exist\n") % patch) | |
573 | return (1, None) |
|
573 | return (1, None) | |
574 | pushable, reason = self.pushable(patch) |
|
574 | pushable, reason = self.pushable(patch) | |
575 | if not pushable: |
|
575 | if not pushable: | |
576 | self.explain_pushable(patch, all_patches=True) |
|
576 | self.explain_pushable(patch, all_patches=True) | |
577 | continue |
|
577 | continue | |
578 | info = mergeq.isapplied(patch) |
|
578 | info = mergeq.isapplied(patch) | |
579 | if not info: |
|
579 | if not info: | |
580 | self.ui.warn(_("patch %s is not applied\n") % patch) |
|
580 | self.ui.warn(_("patch %s is not applied\n") % patch) | |
581 | return (1, None) |
|
581 | return (1, None) | |
582 | rev = info[1] |
|
582 | rev = info[1] | |
583 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) |
|
583 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) | |
584 | if head: |
|
584 | if head: | |
585 | self.applied.append(statusentry(head, patch)) |
|
585 | self.applied.append(statusentry(head, patch)) | |
586 | self.applied_dirty = 1 |
|
586 | self.applied_dirty = 1 | |
587 | if err: |
|
587 | if err: | |
588 | return (err, head) |
|
588 | return (err, head) | |
589 | self.save_dirty() |
|
589 | self.save_dirty() | |
590 | return (0, head) |
|
590 | return (0, head) | |
591 |
|
591 | |||
592 | def patch(self, repo, patchfile): |
|
592 | def patch(self, repo, patchfile): | |
593 | '''Apply patchfile to the working directory. |
|
593 | '''Apply patchfile to the working directory. | |
594 | patchfile: name of patch file''' |
|
594 | patchfile: name of patch file''' | |
595 | files = {} |
|
595 | files = {} | |
596 | try: |
|
596 | try: | |
597 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
|
597 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, | |
598 | files=files, eolmode=None) |
|
598 | files=files, eolmode=None) | |
599 | except Exception, inst: |
|
599 | except Exception, inst: | |
600 | self.ui.note(str(inst) + '\n') |
|
600 | self.ui.note(str(inst) + '\n') | |
601 | if not self.ui.verbose: |
|
601 | if not self.ui.verbose: | |
602 | self.ui.warn(_("patch failed, unable to continue (try -v)\n")) |
|
602 | self.ui.warn(_("patch failed, unable to continue (try -v)\n")) | |
603 | return (False, files, False) |
|
603 | return (False, files, False) | |
604 |
|
604 | |||
605 | return (True, files, fuzz) |
|
605 | return (True, files, fuzz) | |
606 |
|
606 | |||
607 | def apply(self, repo, series, list=False, update_status=True, |
|
607 | def apply(self, repo, series, list=False, update_status=True, | |
608 | strict=False, patchdir=None, merge=None, all_files=None): |
|
608 | strict=False, patchdir=None, merge=None, all_files=None): | |
609 | wlock = lock = tr = None |
|
609 | wlock = lock = tr = None | |
610 | try: |
|
610 | try: | |
611 | wlock = repo.wlock() |
|
611 | wlock = repo.wlock() | |
612 | lock = repo.lock() |
|
612 | lock = repo.lock() | |
613 | tr = repo.transaction("qpush") |
|
613 | tr = repo.transaction("qpush") | |
614 | try: |
|
614 | try: | |
615 | ret = self._apply(repo, series, list, update_status, |
|
615 | ret = self._apply(repo, series, list, update_status, | |
616 | strict, patchdir, merge, all_files=all_files) |
|
616 | strict, patchdir, merge, all_files=all_files) | |
617 | tr.close() |
|
617 | tr.close() | |
618 | self.save_dirty() |
|
618 | self.save_dirty() | |
619 | return ret |
|
619 | return ret | |
620 | except: |
|
620 | except: | |
621 | try: |
|
621 | try: | |
622 | tr.abort() |
|
622 | tr.abort() | |
623 | finally: |
|
623 | finally: | |
624 | repo.invalidate() |
|
624 | repo.invalidate() | |
625 | repo.dirstate.invalidate() |
|
625 | repo.dirstate.invalidate() | |
626 | raise |
|
626 | raise | |
627 | finally: |
|
627 | finally: | |
628 | release(tr, lock, wlock) |
|
628 | release(tr, lock, wlock) | |
629 | self.removeundo(repo) |
|
629 | self.removeundo(repo) | |
630 |
|
630 | |||
631 | def _apply(self, repo, series, list=False, update_status=True, |
|
631 | def _apply(self, repo, series, list=False, update_status=True, | |
632 | strict=False, patchdir=None, merge=None, all_files=None): |
|
632 | strict=False, patchdir=None, merge=None, all_files=None): | |
633 | '''returns (error, hash) |
|
633 | '''returns (error, hash) | |
634 | error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz''' |
|
634 | error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz''' | |
635 | # TODO unify with commands.py |
|
635 | # TODO unify with commands.py | |
636 | if not patchdir: |
|
636 | if not patchdir: | |
637 | patchdir = self.path |
|
637 | patchdir = self.path | |
638 | err = 0 |
|
638 | err = 0 | |
639 | n = None |
|
639 | n = None | |
640 | for patchname in series: |
|
640 | for patchname in series: | |
641 | pushable, reason = self.pushable(patchname) |
|
641 | pushable, reason = self.pushable(patchname) | |
642 | if not pushable: |
|
642 | if not pushable: | |
643 | self.explain_pushable(patchname, all_patches=True) |
|
643 | self.explain_pushable(patchname, all_patches=True) | |
644 | continue |
|
644 | continue | |
645 | self.ui.status(_("applying %s\n") % patchname) |
|
645 | self.ui.status(_("applying %s\n") % patchname) | |
646 | pf = os.path.join(patchdir, patchname) |
|
646 | pf = os.path.join(patchdir, patchname) | |
647 |
|
647 | |||
648 | try: |
|
648 | try: | |
649 | ph = patchheader(self.join(patchname), self.plainmode) |
|
649 | ph = patchheader(self.join(patchname), self.plainmode) | |
650 | except: |
|
650 | except: | |
651 | self.ui.warn(_("unable to read %s\n") % patchname) |
|
651 | self.ui.warn(_("unable to read %s\n") % patchname) | |
652 | err = 1 |
|
652 | err = 1 | |
653 | break |
|
653 | break | |
654 |
|
654 | |||
655 | message = ph.message |
|
655 | message = ph.message | |
656 | if not message: |
|
656 | if not message: | |
657 | # The commit message should not be translated |
|
657 | # The commit message should not be translated | |
658 | message = "imported patch %s\n" % patchname |
|
658 | message = "imported patch %s\n" % patchname | |
659 | else: |
|
659 | else: | |
660 | if list: |
|
660 | if list: | |
661 | # The commit message should not be translated |
|
661 | # The commit message should not be translated | |
662 | message.append("\nimported patch %s" % patchname) |
|
662 | message.append("\nimported patch %s" % patchname) | |
663 | message = '\n'.join(message) |
|
663 | message = '\n'.join(message) | |
664 |
|
664 | |||
665 | if ph.haspatch: |
|
665 | if ph.haspatch: | |
666 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
666 | (patcherr, files, fuzz) = self.patch(repo, pf) | |
667 | if all_files is not None: |
|
667 | if all_files is not None: | |
668 | all_files.update(files) |
|
668 | all_files.update(files) | |
669 | patcherr = not patcherr |
|
669 | patcherr = not patcherr | |
670 | else: |
|
670 | else: | |
671 | self.ui.warn(_("patch %s is empty\n") % patchname) |
|
671 | self.ui.warn(_("patch %s is empty\n") % patchname) | |
672 | patcherr, files, fuzz = 0, [], 0 |
|
672 | patcherr, files, fuzz = 0, [], 0 | |
673 |
|
673 | |||
674 | if merge and files: |
|
674 | if merge and files: | |
675 | # Mark as removed/merged and update dirstate parent info |
|
675 | # Mark as removed/merged and update dirstate parent info | |
676 | removed = [] |
|
676 | removed = [] | |
677 | merged = [] |
|
677 | merged = [] | |
678 | for f in files: |
|
678 | for f in files: | |
679 | if os.path.lexists(repo.wjoin(f)): |
|
679 | if os.path.lexists(repo.wjoin(f)): | |
680 | merged.append(f) |
|
680 | merged.append(f) | |
681 | else: |
|
681 | else: | |
682 | removed.append(f) |
|
682 | removed.append(f) | |
683 | for f in removed: |
|
683 | for f in removed: | |
684 | repo.dirstate.remove(f) |
|
684 | repo.dirstate.remove(f) | |
685 | for f in merged: |
|
685 | for f in merged: | |
686 | repo.dirstate.merge(f) |
|
686 | repo.dirstate.merge(f) | |
687 | p1, p2 = repo.dirstate.parents() |
|
687 | p1, p2 = repo.dirstate.parents() | |
688 | repo.dirstate.setparents(p1, merge) |
|
688 | repo.dirstate.setparents(p1, merge) | |
689 |
|
689 | |||
690 | files = cmdutil.updatedir(self.ui, repo, files) |
|
690 | files = cmdutil.updatedir(self.ui, repo, files) | |
691 | match = cmdutil.matchfiles(repo, files or []) |
|
691 | match = cmdutil.matchfiles(repo, files or []) | |
692 | n = repo.commit(message, ph.user, ph.date, match=match, force=True) |
|
692 | n = repo.commit(message, ph.user, ph.date, match=match, force=True) | |
693 |
|
693 | |||
694 | if n is None: |
|
694 | if n is None: | |
695 | raise util.Abort(_("repository commit failed")) |
|
695 | raise util.Abort(_("repository commit failed")) | |
696 |
|
696 | |||
697 | if update_status: |
|
697 | if update_status: | |
698 | self.applied.append(statusentry(n, patchname)) |
|
698 | self.applied.append(statusentry(n, patchname)) | |
699 |
|
699 | |||
700 | if patcherr: |
|
700 | if patcherr: | |
701 | self.ui.warn(_("patch failed, rejects left in working dir\n")) |
|
701 | self.ui.warn(_("patch failed, rejects left in working dir\n")) | |
702 | err = 2 |
|
702 | err = 2 | |
703 | break |
|
703 | break | |
704 |
|
704 | |||
705 | if fuzz and strict: |
|
705 | if fuzz and strict: | |
706 | self.ui.warn(_("fuzz found when applying patch, stopping\n")) |
|
706 | self.ui.warn(_("fuzz found when applying patch, stopping\n")) | |
707 | err = 3 |
|
707 | err = 3 | |
708 | break |
|
708 | break | |
709 | return (err, n) |
|
709 | return (err, n) | |
710 |
|
710 | |||
711 | def _cleanup(self, patches, numrevs, keep=False): |
|
711 | def _cleanup(self, patches, numrevs, keep=False): | |
712 | if not keep: |
|
712 | if not keep: | |
713 | r = self.qrepo() |
|
713 | r = self.qrepo() | |
714 | if r: |
|
714 | if r: | |
715 | r[None].remove(patches, True) |
|
715 | r[None].remove(patches, True) | |
716 | else: |
|
716 | else: | |
717 | for p in patches: |
|
717 | for p in patches: | |
718 | os.unlink(self.join(p)) |
|
718 | os.unlink(self.join(p)) | |
719 |
|
719 | |||
720 | if numrevs: |
|
720 | if numrevs: | |
721 | del self.applied[:numrevs] |
|
721 | del self.applied[:numrevs] | |
722 | self.applied_dirty = 1 |
|
722 | self.applied_dirty = 1 | |
723 |
|
723 | |||
724 | for i in sorted([self.find_series(p) for p in patches], reverse=True): |
|
724 | for i in sorted([self.find_series(p) for p in patches], reverse=True): | |
725 | del self.full_series[i] |
|
725 | del self.full_series[i] | |
726 | self.parse_series() |
|
726 | self.parse_series() | |
727 | self.series_dirty = 1 |
|
727 | self.series_dirty = 1 | |
728 |
|
728 | |||
729 | def _revpatches(self, repo, revs): |
|
729 | def _revpatches(self, repo, revs): | |
730 | firstrev = repo[self.applied[0].node].rev() |
|
730 | firstrev = repo[self.applied[0].node].rev() | |
731 | patches = [] |
|
731 | patches = [] | |
732 | for i, rev in enumerate(revs): |
|
732 | for i, rev in enumerate(revs): | |
733 |
|
733 | |||
734 | if rev < firstrev: |
|
734 | if rev < firstrev: | |
735 | raise util.Abort(_('revision %d is not managed') % rev) |
|
735 | raise util.Abort(_('revision %d is not managed') % rev) | |
736 |
|
736 | |||
737 | ctx = repo[rev] |
|
737 | ctx = repo[rev] | |
738 | base = self.applied[i].node |
|
738 | base = self.applied[i].node | |
739 | if ctx.node() != base: |
|
739 | if ctx.node() != base: | |
740 | msg = _('cannot delete revision %d above applied patches') |
|
740 | msg = _('cannot delete revision %d above applied patches') | |
741 | raise util.Abort(msg % rev) |
|
741 | raise util.Abort(msg % rev) | |
742 |
|
742 | |||
743 | patch = self.applied[i].name |
|
743 | patch = self.applied[i].name | |
744 | for fmt in ('[mq]: %s', 'imported patch %s'): |
|
744 | for fmt in ('[mq]: %s', 'imported patch %s'): | |
745 | if ctx.description() == fmt % patch: |
|
745 | if ctx.description() == fmt % patch: | |
746 | msg = _('patch %s finalized without changeset message\n') |
|
746 | msg = _('patch %s finalized without changeset message\n') | |
747 | repo.ui.status(msg % patch) |
|
747 | repo.ui.status(msg % patch) | |
748 | break |
|
748 | break | |
749 |
|
749 | |||
750 | patches.append(patch) |
|
750 | patches.append(patch) | |
751 | return patches |
|
751 | return patches | |
752 |
|
752 | |||
753 | def finish(self, repo, revs): |
|
753 | def finish(self, repo, revs): | |
754 | patches = self._revpatches(repo, sorted(revs)) |
|
754 | patches = self._revpatches(repo, sorted(revs)) | |
755 | self._cleanup(patches, len(patches)) |
|
755 | self._cleanup(patches, len(patches)) | |
756 |
|
756 | |||
757 | def delete(self, repo, patches, opts): |
|
757 | def delete(self, repo, patches, opts): | |
758 | if not patches and not opts.get('rev'): |
|
758 | if not patches and not opts.get('rev'): | |
759 | raise util.Abort(_('qdelete requires at least one revision or ' |
|
759 | raise util.Abort(_('qdelete requires at least one revision or ' | |
760 | 'patch name')) |
|
760 | 'patch name')) | |
761 |
|
761 | |||
762 | realpatches = [] |
|
762 | realpatches = [] | |
763 | for patch in patches: |
|
763 | for patch in patches: | |
764 | patch = self.lookup(patch, strict=True) |
|
764 | patch = self.lookup(patch, strict=True) | |
765 | info = self.isapplied(patch) |
|
765 | info = self.isapplied(patch) | |
766 | if info: |
|
766 | if info: | |
767 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
767 | raise util.Abort(_("cannot delete applied patch %s") % patch) | |
768 | if patch not in self.series: |
|
768 | if patch not in self.series: | |
769 | raise util.Abort(_("patch %s not in series file") % patch) |
|
769 | raise util.Abort(_("patch %s not in series file") % patch) | |
770 | if patch not in realpatches: |
|
770 | if patch not in realpatches: | |
771 | realpatches.append(patch) |
|
771 | realpatches.append(patch) | |
772 |
|
772 | |||
773 | numrevs = 0 |
|
773 | numrevs = 0 | |
774 | if opts.get('rev'): |
|
774 | if opts.get('rev'): | |
775 | if not self.applied: |
|
775 | if not self.applied: | |
776 | raise util.Abort(_('no patches applied')) |
|
776 | raise util.Abort(_('no patches applied')) | |
777 | revs = cmdutil.revrange(repo, opts.get('rev')) |
|
777 | revs = cmdutil.revrange(repo, opts.get('rev')) | |
778 | if len(revs) > 1 and revs[0] > revs[1]: |
|
778 | if len(revs) > 1 and revs[0] > revs[1]: | |
779 | revs.reverse() |
|
779 | revs.reverse() | |
780 | revpatches = self._revpatches(repo, revs) |
|
780 | revpatches = self._revpatches(repo, revs) | |
781 | realpatches += revpatches |
|
781 | realpatches += revpatches | |
782 | numrevs = len(revpatches) |
|
782 | numrevs = len(revpatches) | |
783 |
|
783 | |||
784 | self._cleanup(realpatches, numrevs, opts.get('keep')) |
|
784 | self._cleanup(realpatches, numrevs, opts.get('keep')) | |
785 |
|
785 | |||
786 | def check_toppatch(self, repo): |
|
786 | def check_toppatch(self, repo): | |
787 | if self.applied: |
|
787 | if self.applied: | |
788 | top = self.applied[-1].node |
|
788 | top = self.applied[-1].node | |
789 | patch = self.applied[-1].name |
|
789 | patch = self.applied[-1].name | |
790 | pp = repo.dirstate.parents() |
|
790 | pp = repo.dirstate.parents() | |
791 | if top not in pp: |
|
791 | if top not in pp: | |
792 | raise util.Abort(_("working directory revision is not qtip")) |
|
792 | raise util.Abort(_("working directory revision is not qtip")) | |
793 | return top, patch |
|
793 | return top, patch | |
794 | return None, None |
|
794 | return None, None | |
795 |
|
795 | |||
796 | def check_localchanges(self, repo, force=False, refresh=True): |
|
796 | def check_localchanges(self, repo, force=False, refresh=True): | |
797 | m, a, r, d = repo.status()[:4] |
|
797 | m, a, r, d = repo.status()[:4] | |
798 | if (m or a or r or d) and not force: |
|
798 | if (m or a or r or d) and not force: | |
799 | if refresh: |
|
799 | if refresh: | |
800 | raise util.Abort(_("local changes found, refresh first")) |
|
800 | raise util.Abort(_("local changes found, refresh first")) | |
801 | else: |
|
801 | else: | |
802 | raise util.Abort(_("local changes found")) |
|
802 | raise util.Abort(_("local changes found")) | |
803 | return m, a, r, d |
|
803 | return m, a, r, d | |
804 |
|
804 | |||
805 | _reserved = ('series', 'status', 'guards') |
|
805 | _reserved = ('series', 'status', 'guards') | |
806 | def check_reserved_name(self, name): |
|
806 | def check_reserved_name(self, name): | |
807 | if (name in self._reserved or name.startswith('.hg') |
|
807 | if (name in self._reserved or name.startswith('.hg') | |
808 | or name.startswith('.mq') or '#' in name or ':' in name): |
|
808 | or name.startswith('.mq') or '#' in name or ':' in name): | |
809 | raise util.Abort(_('"%s" cannot be used as the name of a patch') |
|
809 | raise util.Abort(_('"%s" cannot be used as the name of a patch') | |
810 | % name) |
|
810 | % name) | |
811 |
|
811 | |||
812 | def new(self, repo, patchfn, *pats, **opts): |
|
812 | def new(self, repo, patchfn, *pats, **opts): | |
813 | """options: |
|
813 | """options: | |
814 | msg: a string or a no-argument function returning a string |
|
814 | msg: a string or a no-argument function returning a string | |
815 | """ |
|
815 | """ | |
816 | msg = opts.get('msg') |
|
816 | msg = opts.get('msg') | |
817 | user = opts.get('user') |
|
817 | user = opts.get('user') | |
818 | date = opts.get('date') |
|
818 | date = opts.get('date') | |
819 | if date: |
|
819 | if date: | |
820 | date = util.parsedate(date) |
|
820 | date = util.parsedate(date) | |
821 | diffopts = self.diffopts({'git': opts.get('git')}) |
|
821 | diffopts = self.diffopts({'git': opts.get('git')}) | |
822 | self.check_reserved_name(patchfn) |
|
822 | self.check_reserved_name(patchfn) | |
823 | if os.path.exists(self.join(patchfn)): |
|
823 | if os.path.exists(self.join(patchfn)): | |
824 | raise util.Abort(_('patch "%s" already exists') % patchfn) |
|
824 | raise util.Abort(_('patch "%s" already exists') % patchfn) | |
825 | if opts.get('include') or opts.get('exclude') or pats: |
|
825 | if opts.get('include') or opts.get('exclude') or pats: | |
826 | match = cmdutil.match(repo, pats, opts) |
|
826 | match = cmdutil.match(repo, pats, opts) | |
827 | # detect missing files in pats |
|
827 | # detect missing files in pats | |
828 | def badfn(f, msg): |
|
828 | def badfn(f, msg): | |
829 | raise util.Abort('%s: %s' % (f, msg)) |
|
829 | raise util.Abort('%s: %s' % (f, msg)) | |
830 | match.bad = badfn |
|
830 | match.bad = badfn | |
831 | m, a, r, d = repo.status(match=match)[:4] |
|
831 | m, a, r, d = repo.status(match=match)[:4] | |
832 | else: |
|
832 | else: | |
833 | m, a, r, d = self.check_localchanges(repo, force=True) |
|
833 | m, a, r, d = self.check_localchanges(repo, force=True) | |
834 | match = cmdutil.matchfiles(repo, m + a + r) |
|
834 | match = cmdutil.matchfiles(repo, m + a + r) | |
835 | if len(repo[None].parents()) > 1: |
|
835 | if len(repo[None].parents()) > 1: | |
836 | raise util.Abort(_('cannot manage merge changesets')) |
|
836 | raise util.Abort(_('cannot manage merge changesets')) | |
837 | commitfiles = m + a + r |
|
837 | commitfiles = m + a + r | |
838 | self.check_toppatch(repo) |
|
838 | self.check_toppatch(repo) | |
839 | insert = self.full_series_end() |
|
839 | insert = self.full_series_end() | |
840 | wlock = repo.wlock() |
|
840 | wlock = repo.wlock() | |
841 | try: |
|
841 | try: | |
842 | # if patch file write fails, abort early |
|
842 | # if patch file write fails, abort early | |
843 | p = self.opener(patchfn, "w") |
|
843 | p = self.opener(patchfn, "w") | |
844 | try: |
|
844 | try: | |
845 | if self.plainmode: |
|
845 | if self.plainmode: | |
846 | if user: |
|
846 | if user: | |
847 | p.write("From: " + user + "\n") |
|
847 | p.write("From: " + user + "\n") | |
848 | if not date: |
|
848 | if not date: | |
849 | p.write("\n") |
|
849 | p.write("\n") | |
850 | if date: |
|
850 | if date: | |
851 | p.write("Date: %d %d\n\n" % date) |
|
851 | p.write("Date: %d %d\n\n" % date) | |
852 | else: |
|
852 | else: | |
853 | p.write("# HG changeset patch\n") |
|
853 | p.write("# HG changeset patch\n") | |
854 | p.write("# Parent " |
|
854 | p.write("# Parent " | |
855 | + hex(repo[None].parents()[0].node()) + "\n") |
|
855 | + hex(repo[None].parents()[0].node()) + "\n") | |
856 | if user: |
|
856 | if user: | |
857 | p.write("# User " + user + "\n") |
|
857 | p.write("# User " + user + "\n") | |
858 | if date: |
|
858 | if date: | |
859 | p.write("# Date %s %s\n\n" % date) |
|
859 | p.write("# Date %s %s\n\n" % date) | |
860 | if hasattr(msg, '__call__'): |
|
860 | if hasattr(msg, '__call__'): | |
861 | msg = msg() |
|
861 | msg = msg() | |
862 | commitmsg = msg and msg or ("[mq]: %s" % patchfn) |
|
862 | commitmsg = msg and msg or ("[mq]: %s" % patchfn) | |
863 | n = repo.commit(commitmsg, user, date, match=match, force=True) |
|
863 | n = repo.commit(commitmsg, user, date, match=match, force=True) | |
864 | if n is None: |
|
864 | if n is None: | |
865 | raise util.Abort(_("repo commit failed")) |
|
865 | raise util.Abort(_("repo commit failed")) | |
866 | try: |
|
866 | try: | |
867 | self.full_series[insert:insert] = [patchfn] |
|
867 | self.full_series[insert:insert] = [patchfn] | |
868 | self.applied.append(statusentry(n, patchfn)) |
|
868 | self.applied.append(statusentry(n, patchfn)) | |
869 | self.parse_series() |
|
869 | self.parse_series() | |
870 | self.series_dirty = 1 |
|
870 | self.series_dirty = 1 | |
871 | self.applied_dirty = 1 |
|
871 | self.applied_dirty = 1 | |
872 | if msg: |
|
872 | if msg: | |
873 | msg = msg + "\n\n" |
|
873 | msg = msg + "\n\n" | |
874 | p.write(msg) |
|
874 | p.write(msg) | |
875 | if commitfiles: |
|
875 | if commitfiles: | |
876 | parent = self.qparents(repo, n) |
|
876 | parent = self.qparents(repo, n) | |
877 | chunks = patch.diff(repo, node1=parent, node2=n, |
|
877 | chunks = patch.diff(repo, node1=parent, node2=n, | |
878 | match=match, opts=diffopts) |
|
878 | match=match, opts=diffopts) | |
879 | for chunk in chunks: |
|
879 | for chunk in chunks: | |
880 | p.write(chunk) |
|
880 | p.write(chunk) | |
881 | p.close() |
|
881 | p.close() | |
882 | wlock.release() |
|
882 | wlock.release() | |
883 | wlock = None |
|
883 | wlock = None | |
884 | r = self.qrepo() |
|
884 | r = self.qrepo() | |
885 | if r: |
|
885 | if r: | |
886 | r[None].add([patchfn]) |
|
886 | r[None].add([patchfn]) | |
887 | except: |
|
887 | except: | |
888 | repo.rollback() |
|
888 | repo.rollback() | |
889 | raise |
|
889 | raise | |
890 | except Exception: |
|
890 | except Exception: | |
891 | patchpath = self.join(patchfn) |
|
891 | patchpath = self.join(patchfn) | |
892 | try: |
|
892 | try: | |
893 | os.unlink(patchpath) |
|
893 | os.unlink(patchpath) | |
894 | except: |
|
894 | except: | |
895 | self.ui.warn(_('error unlinking %s\n') % patchpath) |
|
895 | self.ui.warn(_('error unlinking %s\n') % patchpath) | |
896 | raise |
|
896 | raise | |
897 | self.removeundo(repo) |
|
897 | self.removeundo(repo) | |
898 | finally: |
|
898 | finally: | |
899 | release(wlock) |
|
899 | release(wlock) | |
900 |
|
900 | |||
901 | def strip(self, repo, revs, update=True, backup="all", force=None): |
|
901 | def strip(self, repo, revs, update=True, backup="all", force=None): | |
902 | wlock = lock = None |
|
902 | wlock = lock = None | |
903 | try: |
|
903 | try: | |
904 | wlock = repo.wlock() |
|
904 | wlock = repo.wlock() | |
905 | lock = repo.lock() |
|
905 | lock = repo.lock() | |
906 |
|
906 | |||
907 | if update: |
|
907 | if update: | |
908 | self.check_localchanges(repo, force=force, refresh=False) |
|
908 | self.check_localchanges(repo, force=force, refresh=False) | |
909 | urev = self.qparents(repo, revs[0]) |
|
909 | urev = self.qparents(repo, revs[0]) | |
910 | hg.clean(repo, urev) |
|
910 | hg.clean(repo, urev) | |
911 | repo.dirstate.write() |
|
911 | repo.dirstate.write() | |
912 |
|
912 | |||
913 | self.removeundo(repo) |
|
913 | self.removeundo(repo) | |
914 | for rev in revs: |
|
914 | for rev in revs: | |
915 | repair.strip(self.ui, repo, rev, backup) |
|
915 | repair.strip(self.ui, repo, rev, backup) | |
916 | # strip may have unbundled a set of backed up revisions after |
|
916 | # strip may have unbundled a set of backed up revisions after | |
917 | # the actual strip |
|
917 | # the actual strip | |
918 | self.removeundo(repo) |
|
918 | self.removeundo(repo) | |
919 | finally: |
|
919 | finally: | |
920 | release(lock, wlock) |
|
920 | release(lock, wlock) | |
921 |
|
921 | |||
922 | def isapplied(self, patch): |
|
922 | def isapplied(self, patch): | |
923 | """returns (index, rev, patch)""" |
|
923 | """returns (index, rev, patch)""" | |
924 | for i, a in enumerate(self.applied): |
|
924 | for i, a in enumerate(self.applied): | |
925 | if a.name == patch: |
|
925 | if a.name == patch: | |
926 | return (i, a.node, a.name) |
|
926 | return (i, a.node, a.name) | |
927 | return None |
|
927 | return None | |
928 |
|
928 | |||
929 | # if the exact patch name does not exist, we try a few |
|
929 | # if the exact patch name does not exist, we try a few | |
930 | # variations. If strict is passed, we try only #1 |
|
930 | # variations. If strict is passed, we try only #1 | |
931 | # |
|
931 | # | |
932 | # 1) a number to indicate an offset in the series file |
|
932 | # 1) a number to indicate an offset in the series file | |
933 | # 2) a unique substring of the patch name was given |
|
933 | # 2) a unique substring of the patch name was given | |
934 | # 3) patchname[-+]num to indicate an offset in the series file |
|
934 | # 3) patchname[-+]num to indicate an offset in the series file | |
935 | def lookup(self, patch, strict=False): |
|
935 | def lookup(self, patch, strict=False): | |
936 | patch = patch and str(patch) |
|
936 | patch = patch and str(patch) | |
937 |
|
937 | |||
938 | def partial_name(s): |
|
938 | def partial_name(s): | |
939 | if s in self.series: |
|
939 | if s in self.series: | |
940 | return s |
|
940 | return s | |
941 | matches = [x for x in self.series if s in x] |
|
941 | matches = [x for x in self.series if s in x] | |
942 | if len(matches) > 1: |
|
942 | if len(matches) > 1: | |
943 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
943 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) | |
944 | for m in matches: |
|
944 | for m in matches: | |
945 | self.ui.warn(' %s\n' % m) |
|
945 | self.ui.warn(' %s\n' % m) | |
946 | return None |
|
946 | return None | |
947 | if matches: |
|
947 | if matches: | |
948 | return matches[0] |
|
948 | return matches[0] | |
949 | if self.series and self.applied: |
|
949 | if self.series and self.applied: | |
950 | if s == 'qtip': |
|
950 | if s == 'qtip': | |
951 | return self.series[self.series_end(True)-1] |
|
951 | return self.series[self.series_end(True)-1] | |
952 | if s == 'qbase': |
|
952 | if s == 'qbase': | |
953 | return self.series[0] |
|
953 | return self.series[0] | |
954 | return None |
|
954 | return None | |
955 |
|
955 | |||
956 | if patch is None: |
|
956 | if patch is None: | |
957 | return None |
|
957 | return None | |
958 | if patch in self.series: |
|
958 | if patch in self.series: | |
959 | return patch |
|
959 | return patch | |
960 |
|
960 | |||
961 | if not os.path.isfile(self.join(patch)): |
|
961 | if not os.path.isfile(self.join(patch)): | |
962 | try: |
|
962 | try: | |
963 | sno = int(patch) |
|
963 | sno = int(patch) | |
964 | except (ValueError, OverflowError): |
|
964 | except (ValueError, OverflowError): | |
965 | pass |
|
965 | pass | |
966 | else: |
|
966 | else: | |
967 | if -len(self.series) <= sno < len(self.series): |
|
967 | if -len(self.series) <= sno < len(self.series): | |
968 | return self.series[sno] |
|
968 | return self.series[sno] | |
969 |
|
969 | |||
970 | if not strict: |
|
970 | if not strict: | |
971 | res = partial_name(patch) |
|
971 | res = partial_name(patch) | |
972 | if res: |
|
972 | if res: | |
973 | return res |
|
973 | return res | |
974 | minus = patch.rfind('-') |
|
974 | minus = patch.rfind('-') | |
975 | if minus >= 0: |
|
975 | if minus >= 0: | |
976 | res = partial_name(patch[:minus]) |
|
976 | res = partial_name(patch[:minus]) | |
977 | if res: |
|
977 | if res: | |
978 | i = self.series.index(res) |
|
978 | i = self.series.index(res) | |
979 | try: |
|
979 | try: | |
980 | off = int(patch[minus + 1:] or 1) |
|
980 | off = int(patch[minus + 1:] or 1) | |
981 | except (ValueError, OverflowError): |
|
981 | except (ValueError, OverflowError): | |
982 | pass |
|
982 | pass | |
983 | else: |
|
983 | else: | |
984 | if i - off >= 0: |
|
984 | if i - off >= 0: | |
985 | return self.series[i - off] |
|
985 | return self.series[i - off] | |
986 | plus = patch.rfind('+') |
|
986 | plus = patch.rfind('+') | |
987 | if plus >= 0: |
|
987 | if plus >= 0: | |
988 | res = partial_name(patch[:plus]) |
|
988 | res = partial_name(patch[:plus]) | |
989 | if res: |
|
989 | if res: | |
990 | i = self.series.index(res) |
|
990 | i = self.series.index(res) | |
991 | try: |
|
991 | try: | |
992 | off = int(patch[plus + 1:] or 1) |
|
992 | off = int(patch[plus + 1:] or 1) | |
993 | except (ValueError, OverflowError): |
|
993 | except (ValueError, OverflowError): | |
994 | pass |
|
994 | pass | |
995 | else: |
|
995 | else: | |
996 | if i + off < len(self.series): |
|
996 | if i + off < len(self.series): | |
997 | return self.series[i + off] |
|
997 | return self.series[i + off] | |
998 | raise util.Abort(_("patch %s not in series") % patch) |
|
998 | raise util.Abort(_("patch %s not in series") % patch) | |
999 |
|
999 | |||
1000 | def push(self, repo, patch=None, force=False, list=False, |
|
1000 | def push(self, repo, patch=None, force=False, list=False, | |
1001 | mergeq=None, all=False, move=False): |
|
1001 | mergeq=None, all=False, move=False): | |
1002 | diffopts = self.diffopts() |
|
1002 | diffopts = self.diffopts() | |
1003 | wlock = repo.wlock() |
|
1003 | wlock = repo.wlock() | |
1004 | try: |
|
1004 | try: | |
1005 | heads = [] |
|
1005 | heads = [] | |
1006 | for b, ls in repo.branchmap().iteritems(): |
|
1006 | for b, ls in repo.branchmap().iteritems(): | |
1007 | heads += ls |
|
1007 | heads += ls | |
1008 | if not heads: |
|
1008 | if not heads: | |
1009 | heads = [nullid] |
|
1009 | heads = [nullid] | |
1010 | if repo.dirstate.parents()[0] not in heads: |
|
1010 | if repo.dirstate.parents()[0] not in heads: | |
1011 | self.ui.status(_("(working directory not at a head)\n")) |
|
1011 | self.ui.status(_("(working directory not at a head)\n")) | |
1012 |
|
1012 | |||
1013 | if not self.series: |
|
1013 | if not self.series: | |
1014 | self.ui.warn(_('no patches in series\n')) |
|
1014 | self.ui.warn(_('no patches in series\n')) | |
1015 | return 0 |
|
1015 | return 0 | |
1016 |
|
1016 | |||
1017 | patch = self.lookup(patch) |
|
1017 | patch = self.lookup(patch) | |
1018 | # Suppose our series file is: A B C and the current 'top' |
|
1018 | # Suppose our series file is: A B C and the current 'top' | |
1019 | # patch is B. qpush C should be performed (moving forward) |
|
1019 | # patch is B. qpush C should be performed (moving forward) | |
1020 | # qpush B is a NOP (no change) qpush A is an error (can't |
|
1020 | # qpush B is a NOP (no change) qpush A is an error (can't | |
1021 | # go backwards with qpush) |
|
1021 | # go backwards with qpush) | |
1022 | if patch: |
|
1022 | if patch: | |
1023 | info = self.isapplied(patch) |
|
1023 | info = self.isapplied(patch) | |
1024 | if info: |
|
1024 | if info: | |
1025 | if info[0] < len(self.applied) - 1: |
|
1025 | if info[0] < len(self.applied) - 1: | |
1026 | raise util.Abort( |
|
1026 | raise util.Abort( | |
1027 | _("cannot push to a previous patch: %s") % patch) |
|
1027 | _("cannot push to a previous patch: %s") % patch) | |
1028 | self.ui.warn( |
|
1028 | self.ui.warn( | |
1029 | _('qpush: %s is already at the top\n') % patch) |
|
1029 | _('qpush: %s is already at the top\n') % patch) | |
1030 | return 0 |
|
1030 | return 0 | |
1031 | pushable, reason = self.pushable(patch) |
|
1031 | pushable, reason = self.pushable(patch) | |
1032 | if not pushable: |
|
1032 | if not pushable: | |
1033 | if reason: |
|
1033 | if reason: | |
1034 | reason = _('guarded by %r') % reason |
|
1034 | reason = _('guarded by %r') % reason | |
1035 | else: |
|
1035 | else: | |
1036 | reason = _('no matching guards') |
|
1036 | reason = _('no matching guards') | |
1037 | self.ui.warn(_("cannot push '%s' - %s\n") % (patch, reason)) |
|
1037 | self.ui.warn(_("cannot push '%s' - %s\n") % (patch, reason)) | |
1038 | return 1 |
|
1038 | return 1 | |
1039 | elif all: |
|
1039 | elif all: | |
1040 | patch = self.series[-1] |
|
1040 | patch = self.series[-1] | |
1041 | if self.isapplied(patch): |
|
1041 | if self.isapplied(patch): | |
1042 | self.ui.warn(_('all patches are currently applied\n')) |
|
1042 | self.ui.warn(_('all patches are currently applied\n')) | |
1043 | return 0 |
|
1043 | return 0 | |
1044 |
|
1044 | |||
1045 | # Following the above example, starting at 'top' of B: |
|
1045 | # Following the above example, starting at 'top' of B: | |
1046 | # qpush should be performed (pushes C), but a subsequent |
|
1046 | # qpush should be performed (pushes C), but a subsequent | |
1047 | # qpush without an argument is an error (nothing to |
|
1047 | # qpush without an argument is an error (nothing to | |
1048 | # apply). This allows a loop of "...while hg qpush..." to |
|
1048 | # apply). This allows a loop of "...while hg qpush..." to | |
1049 | # work as it detects an error when done |
|
1049 | # work as it detects an error when done | |
1050 | start = self.series_end() |
|
1050 | start = self.series_end() | |
1051 | if start == len(self.series): |
|
1051 | if start == len(self.series): | |
1052 | self.ui.warn(_('patch series already fully applied\n')) |
|
1052 | self.ui.warn(_('patch series already fully applied\n')) | |
1053 | return 1 |
|
1053 | return 1 | |
1054 | if not force: |
|
1054 | if not force: | |
1055 | self.check_localchanges(repo) |
|
1055 | self.check_localchanges(repo) | |
1056 |
|
1056 | |||
1057 | if move: |
|
1057 | if move: | |
1058 | if not patch: |
|
1058 | if not patch: | |
1059 | raise util.Abort(_("please specify the patch to move")) |
|
1059 | raise util.Abort(_("please specify the patch to move")) | |
1060 | for i, rpn in enumerate(self.full_series[start:]): |
|
1060 | for i, rpn in enumerate(self.full_series[start:]): | |
1061 | # strip markers for patch guards |
|
1061 | # strip markers for patch guards | |
1062 | if self.guard_re.split(rpn, 1)[0] == patch: |
|
1062 | if self.guard_re.split(rpn, 1)[0] == patch: | |
1063 | break |
|
1063 | break | |
1064 | index = start + i |
|
1064 | index = start + i | |
1065 | assert index < len(self.full_series) |
|
1065 | assert index < len(self.full_series) | |
1066 | fullpatch = self.full_series[index] |
|
1066 | fullpatch = self.full_series[index] | |
1067 | del self.full_series[index] |
|
1067 | del self.full_series[index] | |
1068 | self.full_series.insert(start, fullpatch) |
|
1068 | self.full_series.insert(start, fullpatch) | |
1069 | self.parse_series() |
|
1069 | self.parse_series() | |
1070 | self.series_dirty = 1 |
|
1070 | self.series_dirty = 1 | |
1071 |
|
1071 | |||
1072 | self.applied_dirty = 1 |
|
1072 | self.applied_dirty = 1 | |
1073 | if start > 0: |
|
1073 | if start > 0: | |
1074 | self.check_toppatch(repo) |
|
1074 | self.check_toppatch(repo) | |
1075 | if not patch: |
|
1075 | if not patch: | |
1076 | patch = self.series[start] |
|
1076 | patch = self.series[start] | |
1077 | end = start + 1 |
|
1077 | end = start + 1 | |
1078 | else: |
|
1078 | else: | |
1079 | end = self.series.index(patch, start) + 1 |
|
1079 | end = self.series.index(patch, start) + 1 | |
1080 |
|
1080 | |||
1081 | s = self.series[start:end] |
|
1081 | s = self.series[start:end] | |
1082 | all_files = set() |
|
1082 | all_files = set() | |
1083 | try: |
|
1083 | try: | |
1084 | if mergeq: |
|
1084 | if mergeq: | |
1085 | ret = self.mergepatch(repo, mergeq, s, diffopts) |
|
1085 | ret = self.mergepatch(repo, mergeq, s, diffopts) | |
1086 | else: |
|
1086 | else: | |
1087 | ret = self.apply(repo, s, list, all_files=all_files) |
|
1087 | ret = self.apply(repo, s, list, all_files=all_files) | |
1088 | except: |
|
1088 | except: | |
1089 | self.ui.warn(_('cleaning up working directory...')) |
|
1089 | self.ui.warn(_('cleaning up working directory...')) | |
1090 | node = repo.dirstate.parents()[0] |
|
1090 | node = repo.dirstate.parents()[0] | |
1091 | hg.revert(repo, node, None) |
|
1091 | hg.revert(repo, node, None) | |
1092 | # only remove unknown files that we know we touched or |
|
1092 | # only remove unknown files that we know we touched or | |
1093 | # created while patching |
|
1093 | # created while patching | |
1094 | for f in all_files: |
|
1094 | for f in all_files: | |
1095 | if f not in repo.dirstate: |
|
1095 | if f not in repo.dirstate: | |
1096 | try: |
|
1096 | try: | |
1097 | util.unlink(repo.wjoin(f)) |
|
1097 | util.unlink(repo.wjoin(f)) | |
1098 | except OSError, inst: |
|
1098 | except OSError, inst: | |
1099 | if inst.errno != errno.ENOENT: |
|
1099 | if inst.errno != errno.ENOENT: | |
1100 | raise |
|
1100 | raise | |
1101 | self.ui.warn(_('done\n')) |
|
1101 | self.ui.warn(_('done\n')) | |
1102 | raise |
|
1102 | raise | |
1103 |
|
1103 | |||
1104 | if not self.applied: |
|
1104 | if not self.applied: | |
1105 | return ret[0] |
|
1105 | return ret[0] | |
1106 | top = self.applied[-1].name |
|
1106 | top = self.applied[-1].name | |
1107 | if ret[0] and ret[0] > 1: |
|
1107 | if ret[0] and ret[0] > 1: | |
1108 | msg = _("errors during apply, please fix and refresh %s\n") |
|
1108 | msg = _("errors during apply, please fix and refresh %s\n") | |
1109 | self.ui.write(msg % top) |
|
1109 | self.ui.write(msg % top) | |
1110 | else: |
|
1110 | else: | |
1111 | self.ui.write(_("now at: %s\n") % top) |
|
1111 | self.ui.write(_("now at: %s\n") % top) | |
1112 | return ret[0] |
|
1112 | return ret[0] | |
1113 |
|
1113 | |||
1114 | finally: |
|
1114 | finally: | |
1115 | wlock.release() |
|
1115 | wlock.release() | |
1116 |
|
1116 | |||
1117 | def pop(self, repo, patch=None, force=False, update=True, all=False): |
|
1117 | def pop(self, repo, patch=None, force=False, update=True, all=False): | |
1118 | wlock = repo.wlock() |
|
1118 | wlock = repo.wlock() | |
1119 | try: |
|
1119 | try: | |
1120 | if patch: |
|
1120 | if patch: | |
1121 | # index, rev, patch |
|
1121 | # index, rev, patch | |
1122 | info = self.isapplied(patch) |
|
1122 | info = self.isapplied(patch) | |
1123 | if not info: |
|
1123 | if not info: | |
1124 | patch = self.lookup(patch) |
|
1124 | patch = self.lookup(patch) | |
1125 | info = self.isapplied(patch) |
|
1125 | info = self.isapplied(patch) | |
1126 | if not info: |
|
1126 | if not info: | |
1127 | raise util.Abort(_("patch %s is not applied") % patch) |
|
1127 | raise util.Abort(_("patch %s is not applied") % patch) | |
1128 |
|
1128 | |||
1129 | if not self.applied: |
|
1129 | if not self.applied: | |
1130 | # Allow qpop -a to work repeatedly, |
|
1130 | # Allow qpop -a to work repeatedly, | |
1131 | # but not qpop without an argument |
|
1131 | # but not qpop without an argument | |
1132 | self.ui.warn(_("no patches applied\n")) |
|
1132 | self.ui.warn(_("no patches applied\n")) | |
1133 | return not all |
|
1133 | return not all | |
1134 |
|
1134 | |||
1135 | if all: |
|
1135 | if all: | |
1136 | start = 0 |
|
1136 | start = 0 | |
1137 | elif patch: |
|
1137 | elif patch: | |
1138 | start = info[0] + 1 |
|
1138 | start = info[0] + 1 | |
1139 | else: |
|
1139 | else: | |
1140 | start = len(self.applied) - 1 |
|
1140 | start = len(self.applied) - 1 | |
1141 |
|
1141 | |||
1142 | if start >= len(self.applied): |
|
1142 | if start >= len(self.applied): | |
1143 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) |
|
1143 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) | |
1144 | return |
|
1144 | return | |
1145 |
|
1145 | |||
1146 | if not update: |
|
1146 | if not update: | |
1147 | parents = repo.dirstate.parents() |
|
1147 | parents = repo.dirstate.parents() | |
1148 | rr = [x.node for x in self.applied] |
|
1148 | rr = [x.node for x in self.applied] | |
1149 | for p in parents: |
|
1149 | for p in parents: | |
1150 | if p in rr: |
|
1150 | if p in rr: | |
1151 | self.ui.warn(_("qpop: forcing dirstate update\n")) |
|
1151 | self.ui.warn(_("qpop: forcing dirstate update\n")) | |
1152 | update = True |
|
1152 | update = True | |
1153 | else: |
|
1153 | else: | |
1154 | parents = [p.node() for p in repo[None].parents()] |
|
1154 | parents = [p.node() for p in repo[None].parents()] | |
1155 | needupdate = False |
|
1155 | needupdate = False | |
1156 | for entry in self.applied[start:]: |
|
1156 | for entry in self.applied[start:]: | |
1157 | if entry.node in parents: |
|
1157 | if entry.node in parents: | |
1158 | needupdate = True |
|
1158 | needupdate = True | |
1159 | break |
|
1159 | break | |
1160 | update = needupdate |
|
1160 | update = needupdate | |
1161 |
|
1161 | |||
1162 | if not force and update: |
|
1162 | if not force and update: | |
1163 | self.check_localchanges(repo) |
|
1163 | self.check_localchanges(repo) | |
1164 |
|
1164 | |||
1165 | self.applied_dirty = 1 |
|
1165 | self.applied_dirty = 1 | |
1166 | end = len(self.applied) |
|
1166 | end = len(self.applied) | |
1167 | rev = self.applied[start].node |
|
1167 | rev = self.applied[start].node | |
1168 | if update: |
|
1168 | if update: | |
1169 | top = self.check_toppatch(repo)[0] |
|
1169 | top = self.check_toppatch(repo)[0] | |
1170 |
|
1170 | |||
1171 | try: |
|
1171 | try: | |
1172 | heads = repo.changelog.heads(rev) |
|
1172 | heads = repo.changelog.heads(rev) | |
1173 | except error.LookupError: |
|
1173 | except error.LookupError: | |
1174 | node = short(rev) |
|
1174 | node = short(rev) | |
1175 | raise util.Abort(_('trying to pop unknown node %s') % node) |
|
1175 | raise util.Abort(_('trying to pop unknown node %s') % node) | |
1176 |
|
1176 | |||
1177 | if heads != [self.applied[-1].node]: |
|
1177 | if heads != [self.applied[-1].node]: | |
1178 | raise util.Abort(_("popping would remove a revision not " |
|
1178 | raise util.Abort(_("popping would remove a revision not " | |
1179 | "managed by this patch queue")) |
|
1179 | "managed by this patch queue")) | |
1180 |
|
1180 | |||
1181 | # we know there are no local changes, so we can make a simplified |
|
1181 | # we know there are no local changes, so we can make a simplified | |
1182 | # form of hg.update. |
|
1182 | # form of hg.update. | |
1183 | if update: |
|
1183 | if update: | |
1184 | qp = self.qparents(repo, rev) |
|
1184 | qp = self.qparents(repo, rev) | |
1185 | ctx = repo[qp] |
|
1185 | ctx = repo[qp] | |
1186 | m, a, r, d = repo.status(qp, top)[:4] |
|
1186 | m, a, r, d = repo.status(qp, top)[:4] | |
1187 | if d: |
|
1187 | if d: | |
1188 | raise util.Abort(_("deletions found between repo revs")) |
|
1188 | raise util.Abort(_("deletions found between repo revs")) | |
1189 | for f in a: |
|
1189 | for f in a: | |
1190 | try: |
|
1190 | try: | |
1191 | util.unlink(repo.wjoin(f)) |
|
1191 | util.unlink(repo.wjoin(f)) | |
1192 | except OSError, e: |
|
1192 | except OSError, e: | |
1193 | if e.errno != errno.ENOENT: |
|
1193 | if e.errno != errno.ENOENT: | |
1194 | raise |
|
1194 | raise | |
1195 | repo.dirstate.forget(f) |
|
1195 | repo.dirstate.forget(f) | |
1196 | for f in m + r: |
|
1196 | for f in m + r: | |
1197 | fctx = ctx[f] |
|
1197 | fctx = ctx[f] | |
1198 | repo.wwrite(f, fctx.data(), fctx.flags()) |
|
1198 | repo.wwrite(f, fctx.data(), fctx.flags()) | |
1199 | repo.dirstate.normal(f) |
|
1199 | repo.dirstate.normal(f) | |
1200 | repo.dirstate.setparents(qp, nullid) |
|
1200 | repo.dirstate.setparents(qp, nullid) | |
1201 | for patch in reversed(self.applied[start:end]): |
|
1201 | for patch in reversed(self.applied[start:end]): | |
1202 | self.ui.status(_("popping %s\n") % patch.name) |
|
1202 | self.ui.status(_("popping %s\n") % patch.name) | |
1203 | del self.applied[start:end] |
|
1203 | del self.applied[start:end] | |
1204 | self.strip(repo, [rev], update=False, backup='strip') |
|
1204 | self.strip(repo, [rev], update=False, backup='strip') | |
1205 | if self.applied: |
|
1205 | if self.applied: | |
1206 | self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
|
1206 | self.ui.write(_("now at: %s\n") % self.applied[-1].name) | |
1207 | else: |
|
1207 | else: | |
1208 | self.ui.write(_("patch queue now empty\n")) |
|
1208 | self.ui.write(_("patch queue now empty\n")) | |
1209 | finally: |
|
1209 | finally: | |
1210 | wlock.release() |
|
1210 | wlock.release() | |
1211 |
|
1211 | |||
1212 | def diff(self, repo, pats, opts): |
|
1212 | def diff(self, repo, pats, opts): | |
1213 | top, patch = self.check_toppatch(repo) |
|
1213 | top, patch = self.check_toppatch(repo) | |
1214 | if not top: |
|
1214 | if not top: | |
1215 | self.ui.write(_("no patches applied\n")) |
|
1215 | self.ui.write(_("no patches applied\n")) | |
1216 | return |
|
1216 | return | |
1217 | qp = self.qparents(repo, top) |
|
1217 | qp = self.qparents(repo, top) | |
1218 | if opts.get('reverse'): |
|
1218 | if opts.get('reverse'): | |
1219 | node1, node2 = None, qp |
|
1219 | node1, node2 = None, qp | |
1220 | else: |
|
1220 | else: | |
1221 | node1, node2 = qp, None |
|
1221 | node1, node2 = qp, None | |
1222 | diffopts = self.diffopts(opts, patch) |
|
1222 | diffopts = self.diffopts(opts, patch) | |
1223 | self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts) |
|
1223 | self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts) | |
1224 |
|
1224 | |||
1225 | def refresh(self, repo, pats=None, **opts): |
|
1225 | def refresh(self, repo, pats=None, **opts): | |
1226 | if not self.applied: |
|
1226 | if not self.applied: | |
1227 | self.ui.write(_("no patches applied\n")) |
|
1227 | self.ui.write(_("no patches applied\n")) | |
1228 | return 1 |
|
1228 | return 1 | |
1229 | msg = opts.get('msg', '').rstrip() |
|
1229 | msg = opts.get('msg', '').rstrip() | |
1230 | newuser = opts.get('user') |
|
1230 | newuser = opts.get('user') | |
1231 | newdate = opts.get('date') |
|
1231 | newdate = opts.get('date') | |
1232 | if newdate: |
|
1232 | if newdate: | |
1233 | newdate = '%d %d' % util.parsedate(newdate) |
|
1233 | newdate = '%d %d' % util.parsedate(newdate) | |
1234 | wlock = repo.wlock() |
|
1234 | wlock = repo.wlock() | |
1235 |
|
1235 | |||
1236 | try: |
|
1236 | try: | |
1237 | self.check_toppatch(repo) |
|
1237 | self.check_toppatch(repo) | |
1238 | (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) |
|
1238 | (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) | |
1239 | if repo.changelog.heads(top) != [top]: |
|
1239 | if repo.changelog.heads(top) != [top]: | |
1240 | raise util.Abort(_("cannot refresh a revision with children")) |
|
1240 | raise util.Abort(_("cannot refresh a revision with children")) | |
1241 |
|
1241 | |||
1242 | cparents = repo.changelog.parents(top) |
|
1242 | cparents = repo.changelog.parents(top) | |
1243 | patchparent = self.qparents(repo, top) |
|
1243 | patchparent = self.qparents(repo, top) | |
1244 | ph = patchheader(self.join(patchfn), self.plainmode) |
|
1244 | ph = patchheader(self.join(patchfn), self.plainmode) | |
1245 | diffopts = self.diffopts({'git': opts.get('git')}, patchfn) |
|
1245 | diffopts = self.diffopts({'git': opts.get('git')}, patchfn) | |
1246 | if msg: |
|
1246 | if msg: | |
1247 | ph.setmessage(msg) |
|
1247 | ph.setmessage(msg) | |
1248 | if newuser: |
|
1248 | if newuser: | |
1249 | ph.setuser(newuser) |
|
1249 | ph.setuser(newuser) | |
1250 | if newdate: |
|
1250 | if newdate: | |
1251 | ph.setdate(newdate) |
|
1251 | ph.setdate(newdate) | |
1252 | ph.setparent(hex(patchparent)) |
|
1252 | ph.setparent(hex(patchparent)) | |
1253 |
|
1253 | |||
1254 | # only commit new patch when write is complete |
|
1254 | # only commit new patch when write is complete | |
1255 | patchf = self.opener(patchfn, 'w', atomictemp=True) |
|
1255 | patchf = self.opener(patchfn, 'w', atomictemp=True) | |
1256 |
|
1256 | |||
1257 | comments = str(ph) |
|
1257 | comments = str(ph) | |
1258 | if comments: |
|
1258 | if comments: | |
1259 | patchf.write(comments) |
|
1259 | patchf.write(comments) | |
1260 |
|
1260 | |||
1261 | # update the dirstate in place, strip off the qtip commit |
|
1261 | # update the dirstate in place, strip off the qtip commit | |
1262 | # and then commit. |
|
1262 | # and then commit. | |
1263 | # |
|
1263 | # | |
1264 | # this should really read: |
|
1264 | # this should really read: | |
1265 | # mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4] |
|
1265 | # mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4] | |
1266 | # but we do it backwards to take advantage of manifest/chlog |
|
1266 | # but we do it backwards to take advantage of manifest/chlog | |
1267 | # caching against the next repo.status call |
|
1267 | # caching against the next repo.status call | |
1268 | mm, aa, dd, aa2 = repo.status(patchparent, top)[:4] |
|
1268 | mm, aa, dd, aa2 = repo.status(patchparent, top)[:4] | |
1269 | changes = repo.changelog.read(top) |
|
1269 | changes = repo.changelog.read(top) | |
1270 | man = repo.manifest.read(changes[0]) |
|
1270 | man = repo.manifest.read(changes[0]) | |
1271 | aaa = aa[:] |
|
1271 | aaa = aa[:] | |
1272 | matchfn = cmdutil.match(repo, pats, opts) |
|
1272 | matchfn = cmdutil.match(repo, pats, opts) | |
1273 | # in short mode, we only diff the files included in the |
|
1273 | # in short mode, we only diff the files included in the | |
1274 | # patch already plus specified files |
|
1274 | # patch already plus specified files | |
1275 | if opts.get('short'): |
|
1275 | if opts.get('short'): | |
1276 | # if amending a patch, we start with existing |
|
1276 | # if amending a patch, we start with existing | |
1277 | # files plus specified files - unfiltered |
|
1277 | # files plus specified files - unfiltered | |
1278 | match = cmdutil.matchfiles(repo, mm + aa + dd + matchfn.files()) |
|
1278 | match = cmdutil.matchfiles(repo, mm + aa + dd + matchfn.files()) | |
1279 | # filter with inc/exl options |
|
1279 | # filter with inc/exl options | |
1280 | matchfn = cmdutil.match(repo, opts=opts) |
|
1280 | matchfn = cmdutil.match(repo, opts=opts) | |
1281 | else: |
|
1281 | else: | |
1282 | match = cmdutil.matchall(repo) |
|
1282 | match = cmdutil.matchall(repo) | |
1283 | m, a, r, d = repo.status(match=match)[:4] |
|
1283 | m, a, r, d = repo.status(match=match)[:4] | |
1284 |
|
1284 | |||
1285 | # we might end up with files that were added between |
|
1285 | # we might end up with files that were added between | |
1286 | # qtip and the dirstate parent, but then changed in the |
|
1286 | # qtip and the dirstate parent, but then changed in the | |
1287 | # local dirstate. in this case, we want them to only |
|
1287 | # local dirstate. in this case, we want them to only | |
1288 | # show up in the added section |
|
1288 | # show up in the added section | |
1289 | for x in m: |
|
1289 | for x in m: | |
1290 | if x not in aa: |
|
1290 | if x not in aa: | |
1291 | mm.append(x) |
|
1291 | mm.append(x) | |
1292 | # we might end up with files added by the local dirstate that |
|
1292 | # we might end up with files added by the local dirstate that | |
1293 | # were deleted by the patch. In this case, they should only |
|
1293 | # were deleted by the patch. In this case, they should only | |
1294 | # show up in the changed section. |
|
1294 | # show up in the changed section. | |
1295 | for x in a: |
|
1295 | for x in a: | |
1296 | if x in dd: |
|
1296 | if x in dd: | |
1297 | del dd[dd.index(x)] |
|
1297 | del dd[dd.index(x)] | |
1298 | mm.append(x) |
|
1298 | mm.append(x) | |
1299 | else: |
|
1299 | else: | |
1300 | aa.append(x) |
|
1300 | aa.append(x) | |
1301 | # make sure any files deleted in the local dirstate |
|
1301 | # make sure any files deleted in the local dirstate | |
1302 | # are not in the add or change column of the patch |
|
1302 | # are not in the add or change column of the patch | |
1303 | forget = [] |
|
1303 | forget = [] | |
1304 | for x in d + r: |
|
1304 | for x in d + r: | |
1305 | if x in aa: |
|
1305 | if x in aa: | |
1306 | del aa[aa.index(x)] |
|
1306 | del aa[aa.index(x)] | |
1307 | forget.append(x) |
|
1307 | forget.append(x) | |
1308 | continue |
|
1308 | continue | |
1309 | elif x in mm: |
|
1309 | elif x in mm: | |
1310 | del mm[mm.index(x)] |
|
1310 | del mm[mm.index(x)] | |
1311 | dd.append(x) |
|
1311 | dd.append(x) | |
1312 |
|
1312 | |||
1313 | m = list(set(mm)) |
|
1313 | m = list(set(mm)) | |
1314 | r = list(set(dd)) |
|
1314 | r = list(set(dd)) | |
1315 | a = list(set(aa)) |
|
1315 | a = list(set(aa)) | |
1316 | c = [filter(matchfn, l) for l in (m, a, r)] |
|
1316 | c = [filter(matchfn, l) for l in (m, a, r)] | |
1317 | match = cmdutil.matchfiles(repo, set(c[0] + c[1] + c[2])) |
|
1317 | match = cmdutil.matchfiles(repo, set(c[0] + c[1] + c[2])) | |
1318 | chunks = patch.diff(repo, patchparent, match=match, |
|
1318 | chunks = patch.diff(repo, patchparent, match=match, | |
1319 | changes=c, opts=diffopts) |
|
1319 | changes=c, opts=diffopts) | |
1320 | for chunk in chunks: |
|
1320 | for chunk in chunks: | |
1321 | patchf.write(chunk) |
|
1321 | patchf.write(chunk) | |
1322 |
|
1322 | |||
1323 | try: |
|
1323 | try: | |
1324 | if diffopts.git or diffopts.upgrade: |
|
1324 | if diffopts.git or diffopts.upgrade: | |
1325 | copies = {} |
|
1325 | copies = {} | |
1326 | for dst in a: |
|
1326 | for dst in a: | |
1327 | src = repo.dirstate.copied(dst) |
|
1327 | src = repo.dirstate.copied(dst) | |
1328 | # during qfold, the source file for copies may |
|
1328 | # during qfold, the source file for copies may | |
1329 | # be removed. Treat this as a simple add. |
|
1329 | # be removed. Treat this as a simple add. | |
1330 | if src is not None and src in repo.dirstate: |
|
1330 | if src is not None and src in repo.dirstate: | |
1331 | copies.setdefault(src, []).append(dst) |
|
1331 | copies.setdefault(src, []).append(dst) | |
1332 | repo.dirstate.add(dst) |
|
1332 | repo.dirstate.add(dst) | |
1333 | # remember the copies between patchparent and qtip |
|
1333 | # remember the copies between patchparent and qtip | |
1334 | for dst in aaa: |
|
1334 | for dst in aaa: | |
1335 | f = repo.file(dst) |
|
1335 | f = repo.file(dst) | |
1336 | src = f.renamed(man[dst]) |
|
1336 | src = f.renamed(man[dst]) | |
1337 | if src: |
|
1337 | if src: | |
1338 | copies.setdefault(src[0], []).extend( |
|
1338 | copies.setdefault(src[0], []).extend( | |
1339 | copies.get(dst, [])) |
|
1339 | copies.get(dst, [])) | |
1340 | if dst in a: |
|
1340 | if dst in a: | |
1341 | copies[src[0]].append(dst) |
|
1341 | copies[src[0]].append(dst) | |
1342 | # we can't copy a file created by the patch itself |
|
1342 | # we can't copy a file created by the patch itself | |
1343 | if dst in copies: |
|
1343 | if dst in copies: | |
1344 | del copies[dst] |
|
1344 | del copies[dst] | |
1345 | for src, dsts in copies.iteritems(): |
|
1345 | for src, dsts in copies.iteritems(): | |
1346 | for dst in dsts: |
|
1346 | for dst in dsts: | |
1347 | repo.dirstate.copy(src, dst) |
|
1347 | repo.dirstate.copy(src, dst) | |
1348 | else: |
|
1348 | else: | |
1349 | for dst in a: |
|
1349 | for dst in a: | |
1350 | repo.dirstate.add(dst) |
|
1350 | repo.dirstate.add(dst) | |
1351 | # Drop useless copy information |
|
1351 | # Drop useless copy information | |
1352 | for f in list(repo.dirstate.copies()): |
|
1352 | for f in list(repo.dirstate.copies()): | |
1353 | repo.dirstate.copy(None, f) |
|
1353 | repo.dirstate.copy(None, f) | |
1354 | for f in r: |
|
1354 | for f in r: | |
1355 | repo.dirstate.remove(f) |
|
1355 | repo.dirstate.remove(f) | |
1356 | # if the patch excludes a modified file, mark that |
|
1356 | # if the patch excludes a modified file, mark that | |
1357 | # file with mtime=0 so status can see it. |
|
1357 | # file with mtime=0 so status can see it. | |
1358 | mm = [] |
|
1358 | mm = [] | |
1359 | for i in xrange(len(m)-1, -1, -1): |
|
1359 | for i in xrange(len(m)-1, -1, -1): | |
1360 | if not matchfn(m[i]): |
|
1360 | if not matchfn(m[i]): | |
1361 | mm.append(m[i]) |
|
1361 | mm.append(m[i]) | |
1362 | del m[i] |
|
1362 | del m[i] | |
1363 | for f in m: |
|
1363 | for f in m: | |
1364 | repo.dirstate.normal(f) |
|
1364 | repo.dirstate.normal(f) | |
1365 | for f in mm: |
|
1365 | for f in mm: | |
1366 | repo.dirstate.normallookup(f) |
|
1366 | repo.dirstate.normallookup(f) | |
1367 | for f in forget: |
|
1367 | for f in forget: | |
1368 | repo.dirstate.forget(f) |
|
1368 | repo.dirstate.forget(f) | |
1369 |
|
1369 | |||
1370 | if not msg: |
|
1370 | if not msg: | |
1371 | if not ph.message: |
|
1371 | if not ph.message: | |
1372 | message = "[mq]: %s\n" % patchfn |
|
1372 | message = "[mq]: %s\n" % patchfn | |
1373 | else: |
|
1373 | else: | |
1374 | message = "\n".join(ph.message) |
|
1374 | message = "\n".join(ph.message) | |
1375 | else: |
|
1375 | else: | |
1376 | message = msg |
|
1376 | message = msg | |
1377 |
|
1377 | |||
1378 | user = ph.user or changes[1] |
|
1378 | user = ph.user or changes[1] | |
1379 |
|
1379 | |||
1380 | # assumes strip can roll itself back if interrupted |
|
1380 | # assumes strip can roll itself back if interrupted | |
1381 | repo.dirstate.setparents(*cparents) |
|
1381 | repo.dirstate.setparents(*cparents) | |
1382 | self.applied.pop() |
|
1382 | self.applied.pop() | |
1383 | self.applied_dirty = 1 |
|
1383 | self.applied_dirty = 1 | |
1384 | self.strip(repo, [top], update=False, |
|
1384 | self.strip(repo, [top], update=False, | |
1385 | backup='strip') |
|
1385 | backup='strip') | |
1386 | except: |
|
1386 | except: | |
1387 | repo.dirstate.invalidate() |
|
1387 | repo.dirstate.invalidate() | |
1388 | raise |
|
1388 | raise | |
1389 |
|
1389 | |||
1390 | try: |
|
1390 | try: | |
1391 | # might be nice to attempt to roll back strip after this |
|
1391 | # might be nice to attempt to roll back strip after this | |
1392 | patchf.rename() |
|
1392 | patchf.rename() | |
1393 | n = repo.commit(message, user, ph.date, match=match, |
|
1393 | n = repo.commit(message, user, ph.date, match=match, | |
1394 | force=True) |
|
1394 | force=True) | |
1395 | self.applied.append(statusentry(n, patchfn)) |
|
1395 | self.applied.append(statusentry(n, patchfn)) | |
1396 | except: |
|
1396 | except: | |
1397 | ctx = repo[cparents[0]] |
|
1397 | ctx = repo[cparents[0]] | |
1398 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
1398 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) | |
1399 | self.save_dirty() |
|
1399 | self.save_dirty() | |
1400 | self.ui.warn(_('refresh interrupted while patch was popped! ' |
|
1400 | self.ui.warn(_('refresh interrupted while patch was popped! ' | |
1401 | '(revert --all, qpush to recover)\n')) |
|
1401 | '(revert --all, qpush to recover)\n')) | |
1402 | raise |
|
1402 | raise | |
1403 | finally: |
|
1403 | finally: | |
1404 | wlock.release() |
|
1404 | wlock.release() | |
1405 | self.removeundo(repo) |
|
1405 | self.removeundo(repo) | |
1406 |
|
1406 | |||
1407 | def init(self, repo, create=False): |
|
1407 | def init(self, repo, create=False): | |
1408 | if not create and os.path.isdir(self.path): |
|
1408 | if not create and os.path.isdir(self.path): | |
1409 | raise util.Abort(_("patch queue directory already exists")) |
|
1409 | raise util.Abort(_("patch queue directory already exists")) | |
1410 | try: |
|
1410 | try: | |
1411 | os.mkdir(self.path) |
|
1411 | os.mkdir(self.path) | |
1412 | except OSError, inst: |
|
1412 | except OSError, inst: | |
1413 | if inst.errno != errno.EEXIST or not create: |
|
1413 | if inst.errno != errno.EEXIST or not create: | |
1414 | raise |
|
1414 | raise | |
1415 | if create: |
|
1415 | if create: | |
1416 | return self.qrepo(create=True) |
|
1416 | return self.qrepo(create=True) | |
1417 |
|
1417 | |||
1418 | def unapplied(self, repo, patch=None): |
|
1418 | def unapplied(self, repo, patch=None): | |
1419 | if patch and patch not in self.series: |
|
1419 | if patch and patch not in self.series: | |
1420 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1420 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1421 | if not patch: |
|
1421 | if not patch: | |
1422 | start = self.series_end() |
|
1422 | start = self.series_end() | |
1423 | else: |
|
1423 | else: | |
1424 | start = self.series.index(patch) + 1 |
|
1424 | start = self.series.index(patch) + 1 | |
1425 | unapplied = [] |
|
1425 | unapplied = [] | |
1426 | for i in xrange(start, len(self.series)): |
|
1426 | for i in xrange(start, len(self.series)): | |
1427 | pushable, reason = self.pushable(i) |
|
1427 | pushable, reason = self.pushable(i) | |
1428 | if pushable: |
|
1428 | if pushable: | |
1429 | unapplied.append((i, self.series[i])) |
|
1429 | unapplied.append((i, self.series[i])) | |
1430 | self.explain_pushable(i) |
|
1430 | self.explain_pushable(i) | |
1431 | return unapplied |
|
1431 | return unapplied | |
1432 |
|
1432 | |||
1433 | def qseries(self, repo, missing=None, start=0, length=None, status=None, |
|
1433 | def qseries(self, repo, missing=None, start=0, length=None, status=None, | |
1434 | summary=False): |
|
1434 | summary=False): | |
1435 | def displayname(pfx, patchname, state): |
|
1435 | def displayname(pfx, patchname, state): | |
1436 | if pfx: |
|
1436 | if pfx: | |
1437 | self.ui.write(pfx) |
|
1437 | self.ui.write(pfx) | |
1438 | if summary: |
|
1438 | if summary: | |
1439 | ph = patchheader(self.join(patchname), self.plainmode) |
|
1439 | ph = patchheader(self.join(patchname), self.plainmode) | |
1440 | msg = ph.message and ph.message[0] or '' |
|
1440 | msg = ph.message and ph.message[0] or '' | |
1441 | if self.ui.formatted(): |
|
1441 | if self.ui.formatted(): | |
1442 | width = self.ui.termwidth() - len(pfx) - len(patchname) - 2 |
|
1442 | width = self.ui.termwidth() - len(pfx) - len(patchname) - 2 | |
1443 | if width > 0: |
|
1443 | if width > 0: | |
1444 | msg = util.ellipsis(msg, width) |
|
1444 | msg = util.ellipsis(msg, width) | |
1445 | else: |
|
1445 | else: | |
1446 | msg = '' |
|
1446 | msg = '' | |
1447 | self.ui.write(patchname, label='qseries.' + state) |
|
1447 | self.ui.write(patchname, label='qseries.' + state) | |
1448 | self.ui.write(': ') |
|
1448 | self.ui.write(': ') | |
1449 | self.ui.write(msg, label='qseries.message.' + state) |
|
1449 | self.ui.write(msg, label='qseries.message.' + state) | |
1450 | else: |
|
1450 | else: | |
1451 | self.ui.write(patchname, label='qseries.' + state) |
|
1451 | self.ui.write(patchname, label='qseries.' + state) | |
1452 | self.ui.write('\n') |
|
1452 | self.ui.write('\n') | |
1453 |
|
1453 | |||
1454 | applied = set([p.name for p in self.applied]) |
|
1454 | applied = set([p.name for p in self.applied]) | |
1455 | if length is None: |
|
1455 | if length is None: | |
1456 | length = len(self.series) - start |
|
1456 | length = len(self.series) - start | |
1457 | if not missing: |
|
1457 | if not missing: | |
1458 | if self.ui.verbose: |
|
1458 | if self.ui.verbose: | |
1459 | idxwidth = len(str(start + length - 1)) |
|
1459 | idxwidth = len(str(start + length - 1)) | |
1460 | for i in xrange(start, start + length): |
|
1460 | for i in xrange(start, start + length): | |
1461 | patch = self.series[i] |
|
1461 | patch = self.series[i] | |
1462 | if patch in applied: |
|
1462 | if patch in applied: | |
1463 | char, state = 'A', 'applied' |
|
1463 | char, state = 'A', 'applied' | |
1464 | elif self.pushable(i)[0]: |
|
1464 | elif self.pushable(i)[0]: | |
1465 | char, state = 'U', 'unapplied' |
|
1465 | char, state = 'U', 'unapplied' | |
1466 | else: |
|
1466 | else: | |
1467 | char, state = 'G', 'guarded' |
|
1467 | char, state = 'G', 'guarded' | |
1468 | pfx = '' |
|
1468 | pfx = '' | |
1469 | if self.ui.verbose: |
|
1469 | if self.ui.verbose: | |
1470 | pfx = '%*d %s ' % (idxwidth, i, char) |
|
1470 | pfx = '%*d %s ' % (idxwidth, i, char) | |
1471 | elif status and status != char: |
|
1471 | elif status and status != char: | |
1472 | continue |
|
1472 | continue | |
1473 | displayname(pfx, patch, state) |
|
1473 | displayname(pfx, patch, state) | |
1474 | else: |
|
1474 | else: | |
1475 | msng_list = [] |
|
1475 | msng_list = [] | |
1476 | for root, dirs, files in os.walk(self.path): |
|
1476 | for root, dirs, files in os.walk(self.path): | |
1477 | d = root[len(self.path) + 1:] |
|
1477 | d = root[len(self.path) + 1:] | |
1478 | for f in files: |
|
1478 | for f in files: | |
1479 | fl = os.path.join(d, f) |
|
1479 | fl = os.path.join(d, f) | |
1480 | if (fl not in self.series and |
|
1480 | if (fl not in self.series and | |
1481 | fl not in (self.status_path, self.series_path, |
|
1481 | fl not in (self.status_path, self.series_path, | |
1482 | self.guards_path) |
|
1482 | self.guards_path) | |
1483 | and not fl.startswith('.')): |
|
1483 | and not fl.startswith('.')): | |
1484 | msng_list.append(fl) |
|
1484 | msng_list.append(fl) | |
1485 | for x in sorted(msng_list): |
|
1485 | for x in sorted(msng_list): | |
1486 | pfx = self.ui.verbose and ('D ') or '' |
|
1486 | pfx = self.ui.verbose and ('D ') or '' | |
1487 | displayname(pfx, x, 'missing') |
|
1487 | displayname(pfx, x, 'missing') | |
1488 |
|
1488 | |||
1489 | def issaveline(self, l): |
|
1489 | def issaveline(self, l): | |
1490 | if l.name == '.hg.patches.save.line': |
|
1490 | if l.name == '.hg.patches.save.line': | |
1491 | return True |
|
1491 | return True | |
1492 |
|
1492 | |||
1493 | def qrepo(self, create=False): |
|
1493 | def qrepo(self, create=False): | |
1494 | ui = self.ui.copy() |
|
1494 | ui = self.ui.copy() | |
1495 | ui.setconfig('paths', 'default', '', overlay=False) |
|
1495 | ui.setconfig('paths', 'default', '', overlay=False) | |
1496 | ui.setconfig('paths', 'default-push', '', overlay=False) |
|
1496 | ui.setconfig('paths', 'default-push', '', overlay=False) | |
1497 | if create or os.path.isdir(self.join(".hg")): |
|
1497 | if create or os.path.isdir(self.join(".hg")): | |
1498 | return hg.repository(ui, path=self.path, create=create) |
|
1498 | return hg.repository(ui, path=self.path, create=create) | |
1499 |
|
1499 | |||
1500 | def restore(self, repo, rev, delete=None, qupdate=None): |
|
1500 | def restore(self, repo, rev, delete=None, qupdate=None): | |
1501 | desc = repo[rev].description().strip() |
|
1501 | desc = repo[rev].description().strip() | |
1502 | lines = desc.splitlines() |
|
1502 | lines = desc.splitlines() | |
1503 | i = 0 |
|
1503 | i = 0 | |
1504 | datastart = None |
|
1504 | datastart = None | |
1505 | series = [] |
|
1505 | series = [] | |
1506 | applied = [] |
|
1506 | applied = [] | |
1507 | qpp = None |
|
1507 | qpp = None | |
1508 | for i, line in enumerate(lines): |
|
1508 | for i, line in enumerate(lines): | |
1509 | if line == 'Patch Data:': |
|
1509 | if line == 'Patch Data:': | |
1510 | datastart = i + 1 |
|
1510 | datastart = i + 1 | |
1511 | elif line.startswith('Dirstate:'): |
|
1511 | elif line.startswith('Dirstate:'): | |
1512 | l = line.rstrip() |
|
1512 | l = line.rstrip() | |
1513 | l = l[10:].split(' ') |
|
1513 | l = l[10:].split(' ') | |
1514 | qpp = [bin(x) for x in l] |
|
1514 | qpp = [bin(x) for x in l] | |
1515 | elif datastart != None: |
|
1515 | elif datastart != None: | |
1516 | l = line.rstrip() |
|
1516 | l = line.rstrip() | |
1517 | n, name = l.split(':', 1) |
|
1517 | n, name = l.split(':', 1) | |
1518 | if n: |
|
1518 | if n: | |
1519 | applied.append(statusentry(bin(n), name)) |
|
1519 | applied.append(statusentry(bin(n), name)) | |
1520 | else: |
|
1520 | else: | |
1521 | series.append(l) |
|
1521 | series.append(l) | |
1522 | if datastart is None: |
|
1522 | if datastart is None: | |
1523 | self.ui.warn(_("No saved patch data found\n")) |
|
1523 | self.ui.warn(_("No saved patch data found\n")) | |
1524 | return 1 |
|
1524 | return 1 | |
1525 | self.ui.warn(_("restoring status: %s\n") % lines[0]) |
|
1525 | self.ui.warn(_("restoring status: %s\n") % lines[0]) | |
1526 | self.full_series = series |
|
1526 | self.full_series = series | |
1527 | self.applied = applied |
|
1527 | self.applied = applied | |
1528 | self.parse_series() |
|
1528 | self.parse_series() | |
1529 | self.series_dirty = 1 |
|
1529 | self.series_dirty = 1 | |
1530 | self.applied_dirty = 1 |
|
1530 | self.applied_dirty = 1 | |
1531 | heads = repo.changelog.heads() |
|
1531 | heads = repo.changelog.heads() | |
1532 | if delete: |
|
1532 | if delete: | |
1533 | if rev not in heads: |
|
1533 | if rev not in heads: | |
1534 | self.ui.warn(_("save entry has children, leaving it alone\n")) |
|
1534 | self.ui.warn(_("save entry has children, leaving it alone\n")) | |
1535 | else: |
|
1535 | else: | |
1536 | self.ui.warn(_("removing save entry %s\n") % short(rev)) |
|
1536 | self.ui.warn(_("removing save entry %s\n") % short(rev)) | |
1537 | pp = repo.dirstate.parents() |
|
1537 | pp = repo.dirstate.parents() | |
1538 | if rev in pp: |
|
1538 | if rev in pp: | |
1539 | update = True |
|
1539 | update = True | |
1540 | else: |
|
1540 | else: | |
1541 | update = False |
|
1541 | update = False | |
1542 | self.strip(repo, [rev], update=update, backup='strip') |
|
1542 | self.strip(repo, [rev], update=update, backup='strip') | |
1543 | if qpp: |
|
1543 | if qpp: | |
1544 | self.ui.warn(_("saved queue repository parents: %s %s\n") % |
|
1544 | self.ui.warn(_("saved queue repository parents: %s %s\n") % | |
1545 | (short(qpp[0]), short(qpp[1]))) |
|
1545 | (short(qpp[0]), short(qpp[1]))) | |
1546 | if qupdate: |
|
1546 | if qupdate: | |
1547 | self.ui.status(_("updating queue directory\n")) |
|
1547 | self.ui.status(_("updating queue directory\n")) | |
1548 | r = self.qrepo() |
|
1548 | r = self.qrepo() | |
1549 | if not r: |
|
1549 | if not r: | |
1550 | self.ui.warn(_("Unable to load queue repository\n")) |
|
1550 | self.ui.warn(_("Unable to load queue repository\n")) | |
1551 | return 1 |
|
1551 | return 1 | |
1552 | hg.clean(r, qpp[0]) |
|
1552 | hg.clean(r, qpp[0]) | |
1553 |
|
1553 | |||
1554 | def save(self, repo, msg=None): |
|
1554 | def save(self, repo, msg=None): | |
1555 | if not self.applied: |
|
1555 | if not self.applied: | |
1556 | self.ui.warn(_("save: no patches applied, exiting\n")) |
|
1556 | self.ui.warn(_("save: no patches applied, exiting\n")) | |
1557 | return 1 |
|
1557 | return 1 | |
1558 | if self.issaveline(self.applied[-1]): |
|
1558 | if self.issaveline(self.applied[-1]): | |
1559 | self.ui.warn(_("status is already saved\n")) |
|
1559 | self.ui.warn(_("status is already saved\n")) | |
1560 | return 1 |
|
1560 | return 1 | |
1561 |
|
1561 | |||
1562 | if not msg: |
|
1562 | if not msg: | |
1563 | msg = _("hg patches saved state") |
|
1563 | msg = _("hg patches saved state") | |
1564 | else: |
|
1564 | else: | |
1565 | msg = "hg patches: " + msg.rstrip('\r\n') |
|
1565 | msg = "hg patches: " + msg.rstrip('\r\n') | |
1566 | r = self.qrepo() |
|
1566 | r = self.qrepo() | |
1567 | if r: |
|
1567 | if r: | |
1568 | pp = r.dirstate.parents() |
|
1568 | pp = r.dirstate.parents() | |
1569 | msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1])) |
|
1569 | msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1])) | |
1570 | msg += "\n\nPatch Data:\n" |
|
1570 | msg += "\n\nPatch Data:\n" | |
1571 | msg += ''.join('%s\n' % x for x in self.applied) |
|
1571 | msg += ''.join('%s\n' % x for x in self.applied) | |
1572 | msg += ''.join(':%s\n' % x for x in self.full_series) |
|
1572 | msg += ''.join(':%s\n' % x for x in self.full_series) | |
1573 | n = repo.commit(msg, force=True) |
|
1573 | n = repo.commit(msg, force=True) | |
1574 | if not n: |
|
1574 | if not n: | |
1575 | self.ui.warn(_("repo commit failed\n")) |
|
1575 | self.ui.warn(_("repo commit failed\n")) | |
1576 | return 1 |
|
1576 | return 1 | |
1577 | self.applied.append(statusentry(n, '.hg.patches.save.line')) |
|
1577 | self.applied.append(statusentry(n, '.hg.patches.save.line')) | |
1578 | self.applied_dirty = 1 |
|
1578 | self.applied_dirty = 1 | |
1579 | self.removeundo(repo) |
|
1579 | self.removeundo(repo) | |
1580 |
|
1580 | |||
1581 | def full_series_end(self): |
|
1581 | def full_series_end(self): | |
1582 | if self.applied: |
|
1582 | if self.applied: | |
1583 | p = self.applied[-1].name |
|
1583 | p = self.applied[-1].name | |
1584 | end = self.find_series(p) |
|
1584 | end = self.find_series(p) | |
1585 | if end is None: |
|
1585 | if end is None: | |
1586 | return len(self.full_series) |
|
1586 | return len(self.full_series) | |
1587 | return end + 1 |
|
1587 | return end + 1 | |
1588 | return 0 |
|
1588 | return 0 | |
1589 |
|
1589 | |||
1590 | def series_end(self, all_patches=False): |
|
1590 | def series_end(self, all_patches=False): | |
1591 | """If all_patches is False, return the index of the next pushable patch |
|
1591 | """If all_patches is False, return the index of the next pushable patch | |
1592 | in the series, or the series length. If all_patches is True, return the |
|
1592 | in the series, or the series length. If all_patches is True, return the | |
1593 | index of the first patch past the last applied one. |
|
1593 | index of the first patch past the last applied one. | |
1594 | """ |
|
1594 | """ | |
1595 | end = 0 |
|
1595 | end = 0 | |
1596 | def next(start): |
|
1596 | def next(start): | |
1597 | if all_patches or start >= len(self.series): |
|
1597 | if all_patches or start >= len(self.series): | |
1598 | return start |
|
1598 | return start | |
1599 | for i in xrange(start, len(self.series)): |
|
1599 | for i in xrange(start, len(self.series)): | |
1600 | p, reason = self.pushable(i) |
|
1600 | p, reason = self.pushable(i) | |
1601 | if p: |
|
1601 | if p: | |
1602 | break |
|
1602 | break | |
1603 | self.explain_pushable(i) |
|
1603 | self.explain_pushable(i) | |
1604 | return i |
|
1604 | return i | |
1605 | if self.applied: |
|
1605 | if self.applied: | |
1606 | p = self.applied[-1].name |
|
1606 | p = self.applied[-1].name | |
1607 | try: |
|
1607 | try: | |
1608 | end = self.series.index(p) |
|
1608 | end = self.series.index(p) | |
1609 | except ValueError: |
|
1609 | except ValueError: | |
1610 | return 0 |
|
1610 | return 0 | |
1611 | return next(end + 1) |
|
1611 | return next(end + 1) | |
1612 | return next(end) |
|
1612 | return next(end) | |
1613 |
|
1613 | |||
1614 | def appliedname(self, index): |
|
1614 | def appliedname(self, index): | |
1615 | pname = self.applied[index].name |
|
1615 | pname = self.applied[index].name | |
1616 | if not self.ui.verbose: |
|
1616 | if not self.ui.verbose: | |
1617 | p = pname |
|
1617 | p = pname | |
1618 | else: |
|
1618 | else: | |
1619 | p = str(self.series.index(pname)) + " " + pname |
|
1619 | p = str(self.series.index(pname)) + " " + pname | |
1620 | return p |
|
1620 | return p | |
1621 |
|
1621 | |||
1622 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, |
|
1622 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, | |
1623 | force=None, git=False): |
|
1623 | force=None, git=False): | |
1624 | def checkseries(patchname): |
|
1624 | def checkseries(patchname): | |
1625 | if patchname in self.series: |
|
1625 | if patchname in self.series: | |
1626 | raise util.Abort(_('patch %s is already in the series file') |
|
1626 | raise util.Abort(_('patch %s is already in the series file') | |
1627 | % patchname) |
|
1627 | % patchname) | |
1628 | def checkfile(patchname): |
|
1628 | def checkfile(patchname): | |
1629 | if not force and os.path.exists(self.join(patchname)): |
|
1629 | if not force and os.path.exists(self.join(patchname)): | |
1630 | raise util.Abort(_('patch "%s" already exists') |
|
1630 | raise util.Abort(_('patch "%s" already exists') | |
1631 | % patchname) |
|
1631 | % patchname) | |
1632 |
|
1632 | |||
1633 | if rev: |
|
1633 | if rev: | |
1634 | if files: |
|
1634 | if files: | |
1635 | raise util.Abort(_('option "-r" not valid when importing ' |
|
1635 | raise util.Abort(_('option "-r" not valid when importing ' | |
1636 | 'files')) |
|
1636 | 'files')) | |
1637 | rev = cmdutil.revrange(repo, rev) |
|
1637 | rev = cmdutil.revrange(repo, rev) | |
1638 | rev.sort(reverse=True) |
|
1638 | rev.sort(reverse=True) | |
1639 | if (len(files) > 1 or len(rev) > 1) and patchname: |
|
1639 | if (len(files) > 1 or len(rev) > 1) and patchname: | |
1640 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1640 | raise util.Abort(_('option "-n" not valid when importing multiple ' | |
1641 | 'patches')) |
|
1641 | 'patches')) | |
1642 | if rev: |
|
1642 | if rev: | |
1643 | # If mq patches are applied, we can only import revisions |
|
1643 | # If mq patches are applied, we can only import revisions | |
1644 | # that form a linear path to qbase. |
|
1644 | # that form a linear path to qbase. | |
1645 | # Otherwise, they should form a linear path to a head. |
|
1645 | # Otherwise, they should form a linear path to a head. | |
1646 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) |
|
1646 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) | |
1647 | if len(heads) > 1: |
|
1647 | if len(heads) > 1: | |
1648 | raise util.Abort(_('revision %d is the root of more than one ' |
|
1648 | raise util.Abort(_('revision %d is the root of more than one ' | |
1649 | 'branch') % rev[-1]) |
|
1649 | 'branch') % rev[-1]) | |
1650 | if self.applied: |
|
1650 | if self.applied: | |
1651 | base = repo.changelog.node(rev[0]) |
|
1651 | base = repo.changelog.node(rev[0]) | |
1652 | if base in [n.node for n in self.applied]: |
|
1652 | if base in [n.node for n in self.applied]: | |
1653 | raise util.Abort(_('revision %d is already managed') |
|
1653 | raise util.Abort(_('revision %d is already managed') | |
1654 | % rev[0]) |
|
1654 | % rev[0]) | |
1655 | if heads != [self.applied[-1].node]: |
|
1655 | if heads != [self.applied[-1].node]: | |
1656 | raise util.Abort(_('revision %d is not the parent of ' |
|
1656 | raise util.Abort(_('revision %d is not the parent of ' | |
1657 | 'the queue') % rev[0]) |
|
1657 | 'the queue') % rev[0]) | |
1658 | base = repo.changelog.rev(self.applied[0].node) |
|
1658 | base = repo.changelog.rev(self.applied[0].node) | |
1659 | lastparent = repo.changelog.parentrevs(base)[0] |
|
1659 | lastparent = repo.changelog.parentrevs(base)[0] | |
1660 | else: |
|
1660 | else: | |
1661 | if heads != [repo.changelog.node(rev[0])]: |
|
1661 | if heads != [repo.changelog.node(rev[0])]: | |
1662 | raise util.Abort(_('revision %d has unmanaged children') |
|
1662 | raise util.Abort(_('revision %d has unmanaged children') | |
1663 | % rev[0]) |
|
1663 | % rev[0]) | |
1664 | lastparent = None |
|
1664 | lastparent = None | |
1665 |
|
1665 | |||
1666 | diffopts = self.diffopts({'git': git}) |
|
1666 | diffopts = self.diffopts({'git': git}) | |
1667 | for r in rev: |
|
1667 | for r in rev: | |
1668 | p1, p2 = repo.changelog.parentrevs(r) |
|
1668 | p1, p2 = repo.changelog.parentrevs(r) | |
1669 | n = repo.changelog.node(r) |
|
1669 | n = repo.changelog.node(r) | |
1670 | if p2 != nullrev: |
|
1670 | if p2 != nullrev: | |
1671 | raise util.Abort(_('cannot import merge revision %d') % r) |
|
1671 | raise util.Abort(_('cannot import merge revision %d') % r) | |
1672 | if lastparent and lastparent != r: |
|
1672 | if lastparent and lastparent != r: | |
1673 | raise util.Abort(_('revision %d is not the parent of %d') |
|
1673 | raise util.Abort(_('revision %d is not the parent of %d') | |
1674 | % (r, lastparent)) |
|
1674 | % (r, lastparent)) | |
1675 | lastparent = p1 |
|
1675 | lastparent = p1 | |
1676 |
|
1676 | |||
1677 | if not patchname: |
|
1677 | if not patchname: | |
1678 | patchname = normname('%d.diff' % r) |
|
1678 | patchname = normname('%d.diff' % r) | |
1679 | self.check_reserved_name(patchname) |
|
1679 | self.check_reserved_name(patchname) | |
1680 | checkseries(patchname) |
|
1680 | checkseries(patchname) | |
1681 | checkfile(patchname) |
|
1681 | checkfile(patchname) | |
1682 | self.full_series.insert(0, patchname) |
|
1682 | self.full_series.insert(0, patchname) | |
1683 |
|
1683 | |||
1684 | patchf = self.opener(patchname, "w") |
|
1684 | patchf = self.opener(patchname, "w") | |
1685 | cmdutil.export(repo, [n], fp=patchf, opts=diffopts) |
|
1685 | cmdutil.export(repo, [n], fp=patchf, opts=diffopts) | |
1686 | patchf.close() |
|
1686 | patchf.close() | |
1687 |
|
1687 | |||
1688 | se = statusentry(n, patchname) |
|
1688 | se = statusentry(n, patchname) | |
1689 | self.applied.insert(0, se) |
|
1689 | self.applied.insert(0, se) | |
1690 |
|
1690 | |||
1691 | self.added.append(patchname) |
|
1691 | self.added.append(patchname) | |
1692 | patchname = None |
|
1692 | patchname = None | |
1693 | self.parse_series() |
|
1693 | self.parse_series() | |
1694 | self.applied_dirty = 1 |
|
1694 | self.applied_dirty = 1 | |
1695 | self.series_dirty = True |
|
1695 | self.series_dirty = True | |
1696 |
|
1696 | |||
1697 | for i, filename in enumerate(files): |
|
1697 | for i, filename in enumerate(files): | |
1698 | if existing: |
|
1698 | if existing: | |
1699 | if filename == '-': |
|
1699 | if filename == '-': | |
1700 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1700 | raise util.Abort(_('-e is incompatible with import from -')) | |
1701 | filename = normname(filename) |
|
1701 | filename = normname(filename) | |
1702 | self.check_reserved_name(filename) |
|
1702 | self.check_reserved_name(filename) | |
1703 | originpath = self.join(filename) |
|
1703 | originpath = self.join(filename) | |
1704 | if not os.path.isfile(originpath): |
|
1704 | if not os.path.isfile(originpath): | |
1705 | raise util.Abort(_("patch %s does not exist") % filename) |
|
1705 | raise util.Abort(_("patch %s does not exist") % filename) | |
1706 |
|
1706 | |||
1707 | if patchname: |
|
1707 | if patchname: | |
1708 | self.check_reserved_name(patchname) |
|
1708 | self.check_reserved_name(patchname) | |
1709 | checkfile(patchname) |
|
1709 | checkfile(patchname) | |
1710 |
|
1710 | |||
1711 | self.ui.write(_('renaming %s to %s\n') |
|
1711 | self.ui.write(_('renaming %s to %s\n') | |
1712 | % (filename, patchname)) |
|
1712 | % (filename, patchname)) | |
1713 | util.rename(originpath, self.join(patchname)) |
|
1713 | util.rename(originpath, self.join(patchname)) | |
1714 | else: |
|
1714 | else: | |
1715 | patchname = filename |
|
1715 | patchname = filename | |
1716 |
|
1716 | |||
1717 | else: |
|
1717 | else: | |
1718 | try: |
|
1718 | try: | |
1719 | if filename == '-': |
|
1719 | if filename == '-': | |
1720 | if not patchname: |
|
1720 | if not patchname: | |
1721 | raise util.Abort( |
|
1721 | raise util.Abort( | |
1722 | _('need --name to import a patch from -')) |
|
1722 | _('need --name to import a patch from -')) | |
1723 | text = sys.stdin.read() |
|
1723 | text = sys.stdin.read() | |
1724 | else: |
|
1724 | else: | |
1725 | text = url.open(self.ui, filename).read() |
|
1725 | text = url.open(self.ui, filename).read() | |
1726 | except (OSError, IOError): |
|
1726 | except (OSError, IOError): | |
1727 | raise util.Abort(_("unable to read file %s") % filename) |
|
1727 | raise util.Abort(_("unable to read file %s") % filename) | |
1728 | if not patchname: |
|
1728 | if not patchname: | |
1729 | patchname = normname(os.path.basename(filename)) |
|
1729 | patchname = normname(os.path.basename(filename)) | |
1730 | self.check_reserved_name(patchname) |
|
1730 | self.check_reserved_name(patchname) | |
1731 | checkfile(patchname) |
|
1731 | checkfile(patchname) | |
1732 | patchf = self.opener(patchname, "w") |
|
1732 | patchf = self.opener(patchname, "w") | |
1733 | patchf.write(text) |
|
1733 | patchf.write(text) | |
1734 | if not force: |
|
1734 | if not force: | |
1735 | checkseries(patchname) |
|
1735 | checkseries(patchname) | |
1736 | if patchname not in self.series: |
|
1736 | if patchname not in self.series: | |
1737 | index = self.full_series_end() + i |
|
1737 | index = self.full_series_end() + i | |
1738 | self.full_series[index:index] = [patchname] |
|
1738 | self.full_series[index:index] = [patchname] | |
1739 | self.parse_series() |
|
1739 | self.parse_series() | |
1740 | self.series_dirty = True |
|
1740 | self.series_dirty = True | |
1741 | self.ui.warn(_("adding %s to series file\n") % patchname) |
|
1741 | self.ui.warn(_("adding %s to series file\n") % patchname) | |
1742 | self.added.append(patchname) |
|
1742 | self.added.append(patchname) | |
1743 | patchname = None |
|
1743 | patchname = None | |
1744 |
|
1744 | |||
1745 | def delete(ui, repo, *patches, **opts): |
|
1745 | def delete(ui, repo, *patches, **opts): | |
1746 | """remove patches from queue |
|
1746 | """remove patches from queue | |
1747 |
|
1747 | |||
1748 | The patches must not be applied, and at least one patch is required. With |
|
1748 | The patches must not be applied, and at least one patch is required. With | |
1749 | -k/--keep, the patch files are preserved in the patch directory. |
|
1749 | -k/--keep, the patch files are preserved in the patch directory. | |
1750 |
|
1750 | |||
1751 | To stop managing a patch and move it into permanent history, |
|
1751 | To stop managing a patch and move it into permanent history, | |
1752 | use the :hg:`qfinish` command.""" |
|
1752 | use the :hg:`qfinish` command.""" | |
1753 | q = repo.mq |
|
1753 | q = repo.mq | |
1754 | q.delete(repo, patches, opts) |
|
1754 | q.delete(repo, patches, opts) | |
1755 | q.save_dirty() |
|
1755 | q.save_dirty() | |
1756 | return 0 |
|
1756 | return 0 | |
1757 |
|
1757 | |||
1758 | def applied(ui, repo, patch=None, **opts): |
|
1758 | def applied(ui, repo, patch=None, **opts): | |
1759 | """print the patches already applied |
|
1759 | """print the patches already applied | |
1760 |
|
1760 | |||
1761 | Returns 0 on success.""" |
|
1761 | Returns 0 on success.""" | |
1762 |
|
1762 | |||
1763 | q = repo.mq |
|
1763 | q = repo.mq | |
1764 |
|
1764 | |||
1765 | if patch: |
|
1765 | if patch: | |
1766 | if patch not in q.series: |
|
1766 | if patch not in q.series: | |
1767 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1767 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1768 | end = q.series.index(patch) + 1 |
|
1768 | end = q.series.index(patch) + 1 | |
1769 | else: |
|
1769 | else: | |
1770 | end = q.series_end(True) |
|
1770 | end = q.series_end(True) | |
1771 |
|
1771 | |||
1772 | if opts.get('last') and not end: |
|
1772 | if opts.get('last') and not end: | |
1773 | ui.write(_("no patches applied\n")) |
|
1773 | ui.write(_("no patches applied\n")) | |
1774 | return 1 |
|
1774 | return 1 | |
1775 | elif opts.get('last') and end == 1: |
|
1775 | elif opts.get('last') and end == 1: | |
1776 | ui.write(_("only one patch applied\n")) |
|
1776 | ui.write(_("only one patch applied\n")) | |
1777 | return 1 |
|
1777 | return 1 | |
1778 | elif opts.get('last'): |
|
1778 | elif opts.get('last'): | |
1779 | start = end - 2 |
|
1779 | start = end - 2 | |
1780 | end = 1 |
|
1780 | end = 1 | |
1781 | else: |
|
1781 | else: | |
1782 | start = 0 |
|
1782 | start = 0 | |
1783 |
|
1783 | |||
1784 | q.qseries(repo, length=end, start=start, status='A', |
|
1784 | q.qseries(repo, length=end, start=start, status='A', | |
1785 | summary=opts.get('summary')) |
|
1785 | summary=opts.get('summary')) | |
1786 |
|
1786 | |||
1787 |
|
1787 | |||
1788 | def unapplied(ui, repo, patch=None, **opts): |
|
1788 | def unapplied(ui, repo, patch=None, **opts): | |
1789 | """print the patches not yet applied |
|
1789 | """print the patches not yet applied | |
1790 |
|
1790 | |||
1791 | Returns 0 on success.""" |
|
1791 | Returns 0 on success.""" | |
1792 |
|
1792 | |||
1793 | q = repo.mq |
|
1793 | q = repo.mq | |
1794 | if patch: |
|
1794 | if patch: | |
1795 | if patch not in q.series: |
|
1795 | if patch not in q.series: | |
1796 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1796 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1797 | start = q.series.index(patch) + 1 |
|
1797 | start = q.series.index(patch) + 1 | |
1798 | else: |
|
1798 | else: | |
1799 | start = q.series_end(True) |
|
1799 | start = q.series_end(True) | |
1800 |
|
1800 | |||
1801 | if start == len(q.series) and opts.get('first'): |
|
1801 | if start == len(q.series) and opts.get('first'): | |
1802 | ui.write(_("all patches applied\n")) |
|
1802 | ui.write(_("all patches applied\n")) | |
1803 | return 1 |
|
1803 | return 1 | |
1804 |
|
1804 | |||
1805 | length = opts.get('first') and 1 or None |
|
1805 | length = opts.get('first') and 1 or None | |
1806 | q.qseries(repo, start=start, length=length, status='U', |
|
1806 | q.qseries(repo, start=start, length=length, status='U', | |
1807 | summary=opts.get('summary')) |
|
1807 | summary=opts.get('summary')) | |
1808 |
|
1808 | |||
1809 | def qimport(ui, repo, *filename, **opts): |
|
1809 | def qimport(ui, repo, *filename, **opts): | |
1810 | """import a patch |
|
1810 | """import a patch | |
1811 |
|
1811 | |||
1812 | The patch is inserted into the series after the last applied |
|
1812 | The patch is inserted into the series after the last applied | |
1813 | patch. If no patches have been applied, qimport prepends the patch |
|
1813 | patch. If no patches have been applied, qimport prepends the patch | |
1814 | to the series. |
|
1814 | to the series. | |
1815 |
|
1815 | |||
1816 | The patch will have the same name as its source file unless you |
|
1816 | The patch will have the same name as its source file unless you | |
1817 | give it a new one with -n/--name. |
|
1817 | give it a new one with -n/--name. | |
1818 |
|
1818 | |||
1819 | You can register an existing patch inside the patch directory with |
|
1819 | You can register an existing patch inside the patch directory with | |
1820 | the -e/--existing flag. |
|
1820 | the -e/--existing flag. | |
1821 |
|
1821 | |||
1822 | With -f/--force, an existing patch of the same name will be |
|
1822 | With -f/--force, an existing patch of the same name will be | |
1823 | overwritten. |
|
1823 | overwritten. | |
1824 |
|
1824 | |||
1825 | An existing changeset may be placed under mq control with -r/--rev |
|
1825 | An existing changeset may be placed under mq control with -r/--rev | |
1826 | (e.g. qimport --rev tip -n patch will place tip under mq control). |
|
1826 | (e.g. qimport --rev tip -n patch will place tip under mq control). | |
1827 | With -g/--git, patches imported with --rev will use the git diff |
|
1827 | With -g/--git, patches imported with --rev will use the git diff | |
1828 | format. See the diffs help topic for information on why this is |
|
1828 | format. See the diffs help topic for information on why this is | |
1829 | important for preserving rename/copy information and permission |
|
1829 | important for preserving rename/copy information and permission | |
1830 | changes. |
|
1830 | changes. | |
1831 |
|
1831 | |||
1832 | To import a patch from standard input, pass - as the patch file. |
|
1832 | To import a patch from standard input, pass - as the patch file. | |
1833 | When importing from standard input, a patch name must be specified |
|
1833 | When importing from standard input, a patch name must be specified | |
1834 | using the --name flag. |
|
1834 | using the --name flag. | |
1835 |
|
1835 | |||
1836 | To import an existing patch while renaming it:: |
|
1836 | To import an existing patch while renaming it:: | |
1837 |
|
1837 | |||
1838 | hg qimport -e existing-patch -n new-name |
|
1838 | hg qimport -e existing-patch -n new-name | |
1839 |
|
1839 | |||
1840 | Returns 0 if import succeeded. |
|
1840 | Returns 0 if import succeeded. | |
1841 | """ |
|
1841 | """ | |
1842 | q = repo.mq |
|
1842 | q = repo.mq | |
1843 | try: |
|
1843 | try: | |
1844 | q.qimport(repo, filename, patchname=opts.get('name'), |
|
1844 | q.qimport(repo, filename, patchname=opts.get('name'), | |
1845 | existing=opts.get('existing'), force=opts.get('force'), |
|
1845 | existing=opts.get('existing'), force=opts.get('force'), | |
1846 | rev=opts.get('rev'), git=opts.get('git')) |
|
1846 | rev=opts.get('rev'), git=opts.get('git')) | |
1847 | finally: |
|
1847 | finally: | |
1848 | q.save_dirty() |
|
1848 | q.save_dirty() | |
1849 |
|
1849 | |||
1850 | if opts.get('push') and not opts.get('rev'): |
|
1850 | if opts.get('push') and not opts.get('rev'): | |
1851 | return q.push(repo, None) |
|
1851 | return q.push(repo, None) | |
1852 | return 0 |
|
1852 | return 0 | |
1853 |
|
1853 | |||
1854 | def qinit(ui, repo, create): |
|
1854 | def qinit(ui, repo, create): | |
1855 | """initialize a new queue repository |
|
1855 | """initialize a new queue repository | |
1856 |
|
1856 | |||
1857 | This command also creates a series file for ordering patches, and |
|
1857 | This command also creates a series file for ordering patches, and | |
1858 | an mq-specific .hgignore file in the queue repository, to exclude |
|
1858 | an mq-specific .hgignore file in the queue repository, to exclude | |
1859 | the status and guards files (these contain mostly transient state). |
|
1859 | the status and guards files (these contain mostly transient state). | |
1860 |
|
1860 | |||
1861 | Returns 0 if initialization succeeded.""" |
|
1861 | Returns 0 if initialization succeeded.""" | |
1862 | q = repo.mq |
|
1862 | q = repo.mq | |
1863 | r = q.init(repo, create) |
|
1863 | r = q.init(repo, create) | |
1864 | q.save_dirty() |
|
1864 | q.save_dirty() | |
1865 | if r: |
|
1865 | if r: | |
1866 | if not os.path.exists(r.wjoin('.hgignore')): |
|
1866 | if not os.path.exists(r.wjoin('.hgignore')): | |
1867 | fp = r.wopener('.hgignore', 'w') |
|
1867 | fp = r.wopener('.hgignore', 'w') | |
1868 | fp.write('^\\.hg\n') |
|
1868 | fp.write('^\\.hg\n') | |
1869 | fp.write('^\\.mq\n') |
|
1869 | fp.write('^\\.mq\n') | |
1870 | fp.write('syntax: glob\n') |
|
1870 | fp.write('syntax: glob\n') | |
1871 | fp.write('status\n') |
|
1871 | fp.write('status\n') | |
1872 | fp.write('guards\n') |
|
1872 | fp.write('guards\n') | |
1873 | fp.close() |
|
1873 | fp.close() | |
1874 | if not os.path.exists(r.wjoin('series')): |
|
1874 | if not os.path.exists(r.wjoin('series')): | |
1875 | r.wopener('series', 'w').close() |
|
1875 | r.wopener('series', 'w').close() | |
1876 | r[None].add(['.hgignore', 'series']) |
|
1876 | r[None].add(['.hgignore', 'series']) | |
1877 | commands.add(ui, r) |
|
1877 | commands.add(ui, r) | |
1878 | return 0 |
|
1878 | return 0 | |
1879 |
|
1879 | |||
1880 | def init(ui, repo, **opts): |
|
1880 | def init(ui, repo, **opts): | |
1881 | """init a new queue repository (DEPRECATED) |
|
1881 | """init a new queue repository (DEPRECATED) | |
1882 |
|
1882 | |||
1883 | The queue repository is unversioned by default. If |
|
1883 | The queue repository is unversioned by default. If | |
1884 | -c/--create-repo is specified, qinit will create a separate nested |
|
1884 | -c/--create-repo is specified, qinit will create a separate nested | |
1885 | repository for patches (qinit -c may also be run later to convert |
|
1885 | repository for patches (qinit -c may also be run later to convert | |
1886 | an unversioned patch repository into a versioned one). You can use |
|
1886 | an unversioned patch repository into a versioned one). You can use | |
1887 | qcommit to commit changes to this queue repository. |
|
1887 | qcommit to commit changes to this queue repository. | |
1888 |
|
1888 | |||
1889 | This command is deprecated. Without -c, it's implied by other relevant |
|
1889 | This command is deprecated. Without -c, it's implied by other relevant | |
1890 | commands. With -c, use :hg:`init --mq` instead.""" |
|
1890 | commands. With -c, use :hg:`init --mq` instead.""" | |
1891 | return qinit(ui, repo, create=opts.get('create_repo')) |
|
1891 | return qinit(ui, repo, create=opts.get('create_repo')) | |
1892 |
|
1892 | |||
1893 | def clone(ui, source, dest=None, **opts): |
|
1893 | def clone(ui, source, dest=None, **opts): | |
1894 | '''clone main and patch repository at same time |
|
1894 | '''clone main and patch repository at same time | |
1895 |
|
1895 | |||
1896 | If source is local, destination will have no patches applied. If |
|
1896 | If source is local, destination will have no patches applied. If | |
1897 | source is remote, this command can not check if patches are |
|
1897 | source is remote, this command can not check if patches are | |
1898 | applied in source, so cannot guarantee that patches are not |
|
1898 | applied in source, so cannot guarantee that patches are not | |
1899 | applied in destination. If you clone remote repository, be sure |
|
1899 | applied in destination. If you clone remote repository, be sure | |
1900 | before that it has no patches applied. |
|
1900 | before that it has no patches applied. | |
1901 |
|
1901 | |||
1902 | Source patch repository is looked for in <src>/.hg/patches by |
|
1902 | Source patch repository is looked for in <src>/.hg/patches by | |
1903 | default. Use -p <url> to change. |
|
1903 | default. Use -p <url> to change. | |
1904 |
|
1904 | |||
1905 | The patch directory must be a nested Mercurial repository, as |
|
1905 | The patch directory must be a nested Mercurial repository, as | |
1906 | would be created by :hg:`init --mq`. |
|
1906 | would be created by :hg:`init --mq`. | |
1907 |
|
1907 | |||
1908 | Return 0 on success. |
|
1908 | Return 0 on success. | |
1909 | ''' |
|
1909 | ''' | |
1910 | def patchdir(repo): |
|
1910 | def patchdir(repo): | |
1911 | url = repo.url() |
|
1911 | url = repo.url() | |
1912 | if url.endswith('/'): |
|
1912 | if url.endswith('/'): | |
1913 | url = url[:-1] |
|
1913 | url = url[:-1] | |
1914 | return url + '/.hg/patches' |
|
1914 | return url + '/.hg/patches' | |
1915 | if dest is None: |
|
1915 | if dest is None: | |
1916 | dest = hg.defaultdest(source) |
|
1916 | dest = hg.defaultdest(source) | |
1917 | sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source)) |
|
1917 | sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source)) | |
1918 | if opts.get('patches'): |
|
1918 | if opts.get('patches'): | |
1919 | patchespath = ui.expandpath(opts.get('patches')) |
|
1919 | patchespath = ui.expandpath(opts.get('patches')) | |
1920 | else: |
|
1920 | else: | |
1921 | patchespath = patchdir(sr) |
|
1921 | patchespath = patchdir(sr) | |
1922 | try: |
|
1922 | try: | |
1923 | hg.repository(ui, patchespath) |
|
1923 | hg.repository(ui, patchespath) | |
1924 | except error.RepoError: |
|
1924 | except error.RepoError: | |
1925 | raise util.Abort(_('versioned patch repository not found' |
|
1925 | raise util.Abort(_('versioned patch repository not found' | |
1926 | ' (see init --mq)')) |
|
1926 | ' (see init --mq)')) | |
1927 | qbase, destrev = None, None |
|
1927 | qbase, destrev = None, None | |
1928 | if sr.local(): |
|
1928 | if sr.local(): | |
1929 | if sr.mq.applied: |
|
1929 | if sr.mq.applied: | |
1930 | qbase = sr.mq.applied[0].node |
|
1930 | qbase = sr.mq.applied[0].node | |
1931 | if not hg.islocal(dest): |
|
1931 | if not hg.islocal(dest): | |
1932 | heads = set(sr.heads()) |
|
1932 | heads = set(sr.heads()) | |
1933 | destrev = list(heads.difference(sr.heads(qbase))) |
|
1933 | destrev = list(heads.difference(sr.heads(qbase))) | |
1934 | destrev.append(sr.changelog.parents(qbase)[0]) |
|
1934 | destrev.append(sr.changelog.parents(qbase)[0]) | |
1935 | elif sr.capable('lookup'): |
|
1935 | elif sr.capable('lookup'): | |
1936 | try: |
|
1936 | try: | |
1937 | qbase = sr.lookup('qbase') |
|
1937 | qbase = sr.lookup('qbase') | |
1938 | except error.RepoError: |
|
1938 | except error.RepoError: | |
1939 | pass |
|
1939 | pass | |
1940 | ui.note(_('cloning main repository\n')) |
|
1940 | ui.note(_('cloning main repository\n')) | |
1941 | sr, dr = hg.clone(ui, sr.url(), dest, |
|
1941 | sr, dr = hg.clone(ui, sr.url(), dest, | |
1942 | pull=opts.get('pull'), |
|
1942 | pull=opts.get('pull'), | |
1943 | rev=destrev, |
|
1943 | rev=destrev, | |
1944 | update=False, |
|
1944 | update=False, | |
1945 | stream=opts.get('uncompressed')) |
|
1945 | stream=opts.get('uncompressed')) | |
1946 | ui.note(_('cloning patch repository\n')) |
|
1946 | ui.note(_('cloning patch repository\n')) | |
1947 | hg.clone(ui, opts.get('patches') or patchdir(sr), patchdir(dr), |
|
1947 | hg.clone(ui, opts.get('patches') or patchdir(sr), patchdir(dr), | |
1948 | pull=opts.get('pull'), update=not opts.get('noupdate'), |
|
1948 | pull=opts.get('pull'), update=not opts.get('noupdate'), | |
1949 | stream=opts.get('uncompressed')) |
|
1949 | stream=opts.get('uncompressed')) | |
1950 | if dr.local(): |
|
1950 | if dr.local(): | |
1951 | if qbase: |
|
1951 | if qbase: | |
1952 | ui.note(_('stripping applied patches from destination ' |
|
1952 | ui.note(_('stripping applied patches from destination ' | |
1953 | 'repository\n')) |
|
1953 | 'repository\n')) | |
1954 | dr.mq.strip(dr, [qbase], update=False, backup=None) |
|
1954 | dr.mq.strip(dr, [qbase], update=False, backup=None) | |
1955 | if not opts.get('noupdate'): |
|
1955 | if not opts.get('noupdate'): | |
1956 | ui.note(_('updating destination repository\n')) |
|
1956 | ui.note(_('updating destination repository\n')) | |
1957 | hg.update(dr, dr.changelog.tip()) |
|
1957 | hg.update(dr, dr.changelog.tip()) | |
1958 |
|
1958 | |||
1959 | def commit(ui, repo, *pats, **opts): |
|
1959 | def commit(ui, repo, *pats, **opts): | |
1960 | """commit changes in the queue repository (DEPRECATED) |
|
1960 | """commit changes in the queue repository (DEPRECATED) | |
1961 |
|
1961 | |||
1962 | This command is deprecated; use :hg:`commit --mq` instead.""" |
|
1962 | This command is deprecated; use :hg:`commit --mq` instead.""" | |
1963 | q = repo.mq |
|
1963 | q = repo.mq | |
1964 | r = q.qrepo() |
|
1964 | r = q.qrepo() | |
1965 | if not r: |
|
1965 | if not r: | |
1966 | raise util.Abort('no queue repository') |
|
1966 | raise util.Abort('no queue repository') | |
1967 | commands.commit(r.ui, r, *pats, **opts) |
|
1967 | commands.commit(r.ui, r, *pats, **opts) | |
1968 |
|
1968 | |||
1969 | def series(ui, repo, **opts): |
|
1969 | def series(ui, repo, **opts): | |
1970 | """print the entire series file |
|
1970 | """print the entire series file | |
1971 |
|
1971 | |||
1972 | Returns 0 on success.""" |
|
1972 | Returns 0 on success.""" | |
1973 | repo.mq.qseries(repo, missing=opts.get('missing'), summary=opts.get('summary')) |
|
1973 | repo.mq.qseries(repo, missing=opts.get('missing'), summary=opts.get('summary')) | |
1974 | return 0 |
|
1974 | return 0 | |
1975 |
|
1975 | |||
1976 | def top(ui, repo, **opts): |
|
1976 | def top(ui, repo, **opts): | |
1977 | """print the name of the current patch |
|
1977 | """print the name of the current patch | |
1978 |
|
1978 | |||
1979 | Returns 0 on success.""" |
|
1979 | Returns 0 on success.""" | |
1980 | q = repo.mq |
|
1980 | q = repo.mq | |
1981 | t = q.applied and q.series_end(True) or 0 |
|
1981 | t = q.applied and q.series_end(True) or 0 | |
1982 | if t: |
|
1982 | if t: | |
1983 | q.qseries(repo, start=t - 1, length=1, status='A', |
|
1983 | q.qseries(repo, start=t - 1, length=1, status='A', | |
1984 | summary=opts.get('summary')) |
|
1984 | summary=opts.get('summary')) | |
1985 | else: |
|
1985 | else: | |
1986 | ui.write(_("no patches applied\n")) |
|
1986 | ui.write(_("no patches applied\n")) | |
1987 | return 1 |
|
1987 | return 1 | |
1988 |
|
1988 | |||
1989 | def next(ui, repo, **opts): |
|
1989 | def next(ui, repo, **opts): | |
1990 | """print the name of the next patch |
|
1990 | """print the name of the next patch | |
1991 |
|
1991 | |||
1992 | Returns 0 on success.""" |
|
1992 | Returns 0 on success.""" | |
1993 | q = repo.mq |
|
1993 | q = repo.mq | |
1994 | end = q.series_end() |
|
1994 | end = q.series_end() | |
1995 | if end == len(q.series): |
|
1995 | if end == len(q.series): | |
1996 | ui.write(_("all patches applied\n")) |
|
1996 | ui.write(_("all patches applied\n")) | |
1997 | return 1 |
|
1997 | return 1 | |
1998 | q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
1998 | q.qseries(repo, start=end, length=1, summary=opts.get('summary')) | |
1999 |
|
1999 | |||
2000 | def prev(ui, repo, **opts): |
|
2000 | def prev(ui, repo, **opts): | |
2001 | """print the name of the previous patch |
|
2001 | """print the name of the previous patch | |
2002 |
|
2002 | |||
2003 | Returns 0 on success.""" |
|
2003 | Returns 0 on success.""" | |
2004 | q = repo.mq |
|
2004 | q = repo.mq | |
2005 | l = len(q.applied) |
|
2005 | l = len(q.applied) | |
2006 | if l == 1: |
|
2006 | if l == 1: | |
2007 | ui.write(_("only one patch applied\n")) |
|
2007 | ui.write(_("only one patch applied\n")) | |
2008 | return 1 |
|
2008 | return 1 | |
2009 | if not l: |
|
2009 | if not l: | |
2010 | ui.write(_("no patches applied\n")) |
|
2010 | ui.write(_("no patches applied\n")) | |
2011 | return 1 |
|
2011 | return 1 | |
2012 | q.qseries(repo, start=l - 2, length=1, status='A', |
|
2012 | q.qseries(repo, start=l - 2, length=1, status='A', | |
2013 | summary=opts.get('summary')) |
|
2013 | summary=opts.get('summary')) | |
2014 |
|
2014 | |||
2015 | def setupheaderopts(ui, opts): |
|
2015 | def setupheaderopts(ui, opts): | |
2016 | if not opts.get('user') and opts.get('currentuser'): |
|
2016 | if not opts.get('user') and opts.get('currentuser'): | |
2017 | opts['user'] = ui.username() |
|
2017 | opts['user'] = ui.username() | |
2018 | if not opts.get('date') and opts.get('currentdate'): |
|
2018 | if not opts.get('date') and opts.get('currentdate'): | |
2019 | opts['date'] = "%d %d" % util.makedate() |
|
2019 | opts['date'] = "%d %d" % util.makedate() | |
2020 |
|
2020 | |||
2021 | def new(ui, repo, patch, *args, **opts): |
|
2021 | def new(ui, repo, patch, *args, **opts): | |
2022 | """create a new patch |
|
2022 | """create a new patch | |
2023 |
|
2023 | |||
2024 | qnew creates a new patch on top of the currently-applied patch (if |
|
2024 | qnew creates a new patch on top of the currently-applied patch (if | |
2025 | any). The patch will be initialized with any outstanding changes |
|
2025 | any). The patch will be initialized with any outstanding changes | |
2026 | in the working directory. You may also use -I/--include, |
|
2026 | in the working directory. You may also use -I/--include, | |
2027 | -X/--exclude, and/or a list of files after the patch name to add |
|
2027 | -X/--exclude, and/or a list of files after the patch name to add | |
2028 | only changes to matching files to the new patch, leaving the rest |
|
2028 | only changes to matching files to the new patch, leaving the rest | |
2029 | as uncommitted modifications. |
|
2029 | as uncommitted modifications. | |
2030 |
|
2030 | |||
2031 | -u/--user and -d/--date can be used to set the (given) user and |
|
2031 | -u/--user and -d/--date can be used to set the (given) user and | |
2032 | date, respectively. -U/--currentuser and -D/--currentdate set user |
|
2032 | date, respectively. -U/--currentuser and -D/--currentdate set user | |
2033 | to current user and date to current date. |
|
2033 | to current user and date to current date. | |
2034 |
|
2034 | |||
2035 | -e/--edit, -m/--message or -l/--logfile set the patch header as |
|
2035 | -e/--edit, -m/--message or -l/--logfile set the patch header as | |
2036 | well as the commit message. If none is specified, the header is |
|
2036 | well as the commit message. If none is specified, the header is | |
2037 | empty and the commit message is '[mq]: PATCH'. |
|
2037 | empty and the commit message is '[mq]: PATCH'. | |
2038 |
|
2038 | |||
2039 | Use the -g/--git option to keep the patch in the git extended diff |
|
2039 | Use the -g/--git option to keep the patch in the git extended diff | |
2040 | format. Read the diffs help topic for more information on why this |
|
2040 | format. Read the diffs help topic for more information on why this | |
2041 | is important for preserving permission changes and copy/rename |
|
2041 | is important for preserving permission changes and copy/rename | |
2042 | information. |
|
2042 | information. | |
2043 |
|
2043 | |||
2044 | Returns 0 on successful creation of a new patch. |
|
2044 | Returns 0 on successful creation of a new patch. | |
2045 | """ |
|
2045 | """ | |
2046 | msg = cmdutil.logmessage(opts) |
|
2046 | msg = cmdutil.logmessage(opts) | |
2047 | def getmsg(): |
|
2047 | def getmsg(): | |
2048 | return ui.edit(msg, opts.get('user') or ui.username()) |
|
2048 | return ui.edit(msg, opts.get('user') or ui.username()) | |
2049 | q = repo.mq |
|
2049 | q = repo.mq | |
2050 | opts['msg'] = msg |
|
2050 | opts['msg'] = msg | |
2051 | if opts.get('edit'): |
|
2051 | if opts.get('edit'): | |
2052 | opts['msg'] = getmsg |
|
2052 | opts['msg'] = getmsg | |
2053 | else: |
|
2053 | else: | |
2054 | opts['msg'] = msg |
|
2054 | opts['msg'] = msg | |
2055 | setupheaderopts(ui, opts) |
|
2055 | setupheaderopts(ui, opts) | |
2056 | q.new(repo, patch, *args, **opts) |
|
2056 | q.new(repo, patch, *args, **opts) | |
2057 | q.save_dirty() |
|
2057 | q.save_dirty() | |
2058 | return 0 |
|
2058 | return 0 | |
2059 |
|
2059 | |||
2060 | def refresh(ui, repo, *pats, **opts): |
|
2060 | def refresh(ui, repo, *pats, **opts): | |
2061 | """update the current patch |
|
2061 | """update the current patch | |
2062 |
|
2062 | |||
2063 | If any file patterns are provided, the refreshed patch will |
|
2063 | If any file patterns are provided, the refreshed patch will | |
2064 | contain only the modifications that match those patterns; the |
|
2064 | contain only the modifications that match those patterns; the | |
2065 | remaining modifications will remain in the working directory. |
|
2065 | remaining modifications will remain in the working directory. | |
2066 |
|
2066 | |||
2067 | If -s/--short is specified, files currently included in the patch |
|
2067 | If -s/--short is specified, files currently included in the patch | |
2068 | will be refreshed just like matched files and remain in the patch. |
|
2068 | will be refreshed just like matched files and remain in the patch. | |
2069 |
|
2069 | |||
2070 | If -e/--edit is specified, Mercurial will start your configured editor for |
|
2070 | If -e/--edit is specified, Mercurial will start your configured editor for | |
2071 | you to enter a message. In case qrefresh fails, you will find a backup of |
|
2071 | you to enter a message. In case qrefresh fails, you will find a backup of | |
2072 | your message in ``.hg/last-message.txt``. |
|
2072 | your message in ``.hg/last-message.txt``. | |
2073 |
|
2073 | |||
2074 | hg add/remove/copy/rename work as usual, though you might want to |
|
2074 | hg add/remove/copy/rename work as usual, though you might want to | |
2075 | use git-style patches (-g/--git or [diff] git=1) to track copies |
|
2075 | use git-style patches (-g/--git or [diff] git=1) to track copies | |
2076 | and renames. See the diffs help topic for more information on the |
|
2076 | and renames. See the diffs help topic for more information on the | |
2077 | git diff format. |
|
2077 | git diff format. | |
2078 |
|
2078 | |||
2079 | Returns 0 on success. |
|
2079 | Returns 0 on success. | |
2080 | """ |
|
2080 | """ | |
2081 | q = repo.mq |
|
2081 | q = repo.mq | |
2082 | message = cmdutil.logmessage(opts) |
|
2082 | message = cmdutil.logmessage(opts) | |
2083 | if opts.get('edit'): |
|
2083 | if opts.get('edit'): | |
2084 | if not q.applied: |
|
2084 | if not q.applied: | |
2085 | ui.write(_("no patches applied\n")) |
|
2085 | ui.write(_("no patches applied\n")) | |
2086 | return 1 |
|
2086 | return 1 | |
2087 | if message: |
|
2087 | if message: | |
2088 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2088 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
2089 | patch = q.applied[-1].name |
|
2089 | patch = q.applied[-1].name | |
2090 | ph = patchheader(q.join(patch), q.plainmode) |
|
2090 | ph = patchheader(q.join(patch), q.plainmode) | |
2091 | message = ui.edit('\n'.join(ph.message), ph.user or ui.username()) |
|
2091 | message = ui.edit('\n'.join(ph.message), ph.user or ui.username()) | |
2092 | # We don't want to lose the patch message if qrefresh fails (issue2062) |
|
2092 | # We don't want to lose the patch message if qrefresh fails (issue2062) | |
2093 | msgfile = repo.opener('last-message.txt', 'wb') |
|
2093 | msgfile = repo.opener('last-message.txt', 'wb') | |
2094 | msgfile.write(message) |
|
2094 | msgfile.write(message) | |
2095 | msgfile.close() |
|
2095 | msgfile.close() | |
2096 | setupheaderopts(ui, opts) |
|
2096 | setupheaderopts(ui, opts) | |
2097 | ret = q.refresh(repo, pats, msg=message, **opts) |
|
2097 | ret = q.refresh(repo, pats, msg=message, **opts) | |
2098 | q.save_dirty() |
|
2098 | q.save_dirty() | |
2099 | return ret |
|
2099 | return ret | |
2100 |
|
2100 | |||
2101 | def diff(ui, repo, *pats, **opts): |
|
2101 | def diff(ui, repo, *pats, **opts): | |
2102 | """diff of the current patch and subsequent modifications |
|
2102 | """diff of the current patch and subsequent modifications | |
2103 |
|
2103 | |||
2104 | Shows a diff which includes the current patch as well as any |
|
2104 | Shows a diff which includes the current patch as well as any | |
2105 | changes which have been made in the working directory since the |
|
2105 | changes which have been made in the working directory since the | |
2106 | last refresh (thus showing what the current patch would become |
|
2106 | last refresh (thus showing what the current patch would become | |
2107 | after a qrefresh). |
|
2107 | after a qrefresh). | |
2108 |
|
2108 | |||
2109 | Use :hg:`diff` if you only want to see the changes made since the |
|
2109 | Use :hg:`diff` if you only want to see the changes made since the | |
2110 | last qrefresh, or :hg:`export qtip` if you want to see changes |
|
2110 | last qrefresh, or :hg:`export qtip` if you want to see changes | |
2111 | made by the current patch without including changes made since the |
|
2111 | made by the current patch without including changes made since the | |
2112 | qrefresh. |
|
2112 | qrefresh. | |
2113 |
|
2113 | |||
2114 | Returns 0 on success. |
|
2114 | Returns 0 on success. | |
2115 | """ |
|
2115 | """ | |
2116 | repo.mq.diff(repo, pats, opts) |
|
2116 | repo.mq.diff(repo, pats, opts) | |
2117 | return 0 |
|
2117 | return 0 | |
2118 |
|
2118 | |||
2119 | def fold(ui, repo, *files, **opts): |
|
2119 | def fold(ui, repo, *files, **opts): | |
2120 | """fold the named patches into the current patch |
|
2120 | """fold the named patches into the current patch | |
2121 |
|
2121 | |||
2122 | Patches must not yet be applied. Each patch will be successively |
|
2122 | Patches must not yet be applied. Each patch will be successively | |
2123 | applied to the current patch in the order given. If all the |
|
2123 | applied to the current patch in the order given. If all the | |
2124 | patches apply successfully, the current patch will be refreshed |
|
2124 | patches apply successfully, the current patch will be refreshed | |
2125 | with the new cumulative patch, and the folded patches will be |
|
2125 | with the new cumulative patch, and the folded patches will be | |
2126 | deleted. With -k/--keep, the folded patch files will not be |
|
2126 | deleted. With -k/--keep, the folded patch files will not be | |
2127 | removed afterwards. |
|
2127 | removed afterwards. | |
2128 |
|
2128 | |||
2129 | The header for each folded patch will be concatenated with the |
|
2129 | The header for each folded patch will be concatenated with the | |
2130 | current patch header, separated by a line of ``* * *``. |
|
2130 | current patch header, separated by a line of ``* * *``. | |
2131 |
|
2131 | |||
2132 | Returns 0 on success.""" |
|
2132 | Returns 0 on success.""" | |
2133 |
|
2133 | |||
2134 | q = repo.mq |
|
2134 | q = repo.mq | |
2135 |
|
2135 | |||
2136 | if not files: |
|
2136 | if not files: | |
2137 | raise util.Abort(_('qfold requires at least one patch name')) |
|
2137 | raise util.Abort(_('qfold requires at least one patch name')) | |
2138 | if not q.check_toppatch(repo)[0]: |
|
2138 | if not q.check_toppatch(repo)[0]: | |
2139 | raise util.Abort(_('no patches applied')) |
|
2139 | raise util.Abort(_('no patches applied')) | |
2140 | q.check_localchanges(repo) |
|
2140 | q.check_localchanges(repo) | |
2141 |
|
2141 | |||
2142 | message = cmdutil.logmessage(opts) |
|
2142 | message = cmdutil.logmessage(opts) | |
2143 | if opts.get('edit'): |
|
2143 | if opts.get('edit'): | |
2144 | if message: |
|
2144 | if message: | |
2145 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2145 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
2146 |
|
2146 | |||
2147 | parent = q.lookup('qtip') |
|
2147 | parent = q.lookup('qtip') | |
2148 | patches = [] |
|
2148 | patches = [] | |
2149 | messages = [] |
|
2149 | messages = [] | |
2150 | for f in files: |
|
2150 | for f in files: | |
2151 | p = q.lookup(f) |
|
2151 | p = q.lookup(f) | |
2152 | if p in patches or p == parent: |
|
2152 | if p in patches or p == parent: | |
2153 | ui.warn(_('Skipping already folded patch %s\n') % p) |
|
2153 | ui.warn(_('Skipping already folded patch %s\n') % p) | |
2154 | if q.isapplied(p): |
|
2154 | if q.isapplied(p): | |
2155 | raise util.Abort(_('qfold cannot fold already applied patch %s') % p) |
|
2155 | raise util.Abort(_('qfold cannot fold already applied patch %s') % p) | |
2156 | patches.append(p) |
|
2156 | patches.append(p) | |
2157 |
|
2157 | |||
2158 | for p in patches: |
|
2158 | for p in patches: | |
2159 | if not message: |
|
2159 | if not message: | |
2160 | ph = patchheader(q.join(p), q.plainmode) |
|
2160 | ph = patchheader(q.join(p), q.plainmode) | |
2161 | if ph.message: |
|
2161 | if ph.message: | |
2162 | messages.append(ph.message) |
|
2162 | messages.append(ph.message) | |
2163 | pf = q.join(p) |
|
2163 | pf = q.join(p) | |
2164 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
2164 | (patchsuccess, files, fuzz) = q.patch(repo, pf) | |
2165 | if not patchsuccess: |
|
2165 | if not patchsuccess: | |
2166 | raise util.Abort(_('error folding patch %s') % p) |
|
2166 | raise util.Abort(_('error folding patch %s') % p) | |
2167 | cmdutil.updatedir(ui, repo, files) |
|
2167 | cmdutil.updatedir(ui, repo, files) | |
2168 |
|
2168 | |||
2169 | if not message: |
|
2169 | if not message: | |
2170 | ph = patchheader(q.join(parent), q.plainmode) |
|
2170 | ph = patchheader(q.join(parent), q.plainmode) | |
2171 | message, user = ph.message, ph.user |
|
2171 | message, user = ph.message, ph.user | |
2172 | for msg in messages: |
|
2172 | for msg in messages: | |
2173 | message.append('* * *') |
|
2173 | message.append('* * *') | |
2174 | message.extend(msg) |
|
2174 | message.extend(msg) | |
2175 | message = '\n'.join(message) |
|
2175 | message = '\n'.join(message) | |
2176 |
|
2176 | |||
2177 | if opts.get('edit'): |
|
2177 | if opts.get('edit'): | |
2178 | message = ui.edit(message, user or ui.username()) |
|
2178 | message = ui.edit(message, user or ui.username()) | |
2179 |
|
2179 | |||
2180 | diffopts = q.patchopts(q.diffopts(), *patches) |
|
2180 | diffopts = q.patchopts(q.diffopts(), *patches) | |
2181 | q.refresh(repo, msg=message, git=diffopts.git) |
|
2181 | q.refresh(repo, msg=message, git=diffopts.git) | |
2182 | q.delete(repo, patches, opts) |
|
2182 | q.delete(repo, patches, opts) | |
2183 | q.save_dirty() |
|
2183 | q.save_dirty() | |
2184 |
|
2184 | |||
2185 | def goto(ui, repo, patch, **opts): |
|
2185 | def goto(ui, repo, patch, **opts): | |
2186 | '''push or pop patches until named patch is at top of stack |
|
2186 | '''push or pop patches until named patch is at top of stack | |
2187 |
|
2187 | |||
2188 | Returns 0 on success.''' |
|
2188 | Returns 0 on success.''' | |
2189 | q = repo.mq |
|
2189 | q = repo.mq | |
2190 | patch = q.lookup(patch) |
|
2190 | patch = q.lookup(patch) | |
2191 | if q.isapplied(patch): |
|
2191 | if q.isapplied(patch): | |
2192 | ret = q.pop(repo, patch, force=opts.get('force')) |
|
2192 | ret = q.pop(repo, patch, force=opts.get('force')) | |
2193 | else: |
|
2193 | else: | |
2194 | ret = q.push(repo, patch, force=opts.get('force')) |
|
2194 | ret = q.push(repo, patch, force=opts.get('force')) | |
2195 | q.save_dirty() |
|
2195 | q.save_dirty() | |
2196 | return ret |
|
2196 | return ret | |
2197 |
|
2197 | |||
2198 | def guard(ui, repo, *args, **opts): |
|
2198 | def guard(ui, repo, *args, **opts): | |
2199 | '''set or print guards for a patch |
|
2199 | '''set or print guards for a patch | |
2200 |
|
2200 | |||
2201 | Guards control whether a patch can be pushed. A patch with no |
|
2201 | Guards control whether a patch can be pushed. A patch with no | |
2202 | guards is always pushed. A patch with a positive guard ("+foo") is |
|
2202 | guards is always pushed. A patch with a positive guard ("+foo") is | |
2203 | pushed only if the :hg:`qselect` command has activated it. A patch with |
|
2203 | pushed only if the :hg:`qselect` command has activated it. A patch with | |
2204 | a negative guard ("-foo") is never pushed if the :hg:`qselect` command |
|
2204 | a negative guard ("-foo") is never pushed if the :hg:`qselect` command | |
2205 | has activated it. |
|
2205 | has activated it. | |
2206 |
|
2206 | |||
2207 | With no arguments, print the currently active guards. |
|
2207 | With no arguments, print the currently active guards. | |
2208 | With arguments, set guards for the named patch. |
|
2208 | With arguments, set guards for the named patch. | |
2209 |
|
2209 | |||
2210 | .. note:: |
|
2210 | .. note:: | |
2211 | Specifying negative guards now requires '--'. |
|
2211 | Specifying negative guards now requires '--'. | |
2212 |
|
2212 | |||
2213 | To set guards on another patch:: |
|
2213 | To set guards on another patch:: | |
2214 |
|
2214 | |||
2215 | hg qguard other.patch -- +2.6.17 -stable |
|
2215 | hg qguard other.patch -- +2.6.17 -stable | |
2216 |
|
2216 | |||
2217 | Returns 0 on success. |
|
2217 | Returns 0 on success. | |
2218 | ''' |
|
2218 | ''' | |
2219 | def status(idx): |
|
2219 | def status(idx): | |
2220 | guards = q.series_guards[idx] or ['unguarded'] |
|
2220 | guards = q.series_guards[idx] or ['unguarded'] | |
2221 | if q.series[idx] in applied: |
|
2221 | if q.series[idx] in applied: | |
2222 | state = 'applied' |
|
2222 | state = 'applied' | |
2223 | elif q.pushable(idx)[0]: |
|
2223 | elif q.pushable(idx)[0]: | |
2224 | state = 'unapplied' |
|
2224 | state = 'unapplied' | |
2225 | else: |
|
2225 | else: | |
2226 | state = 'guarded' |
|
2226 | state = 'guarded' | |
2227 | label = 'qguard.patch qguard.%s qseries.%s' % (state, state) |
|
2227 | label = 'qguard.patch qguard.%s qseries.%s' % (state, state) | |
2228 | ui.write('%s: ' % ui.label(q.series[idx], label)) |
|
2228 | ui.write('%s: ' % ui.label(q.series[idx], label)) | |
2229 |
|
2229 | |||
2230 | for i, guard in enumerate(guards): |
|
2230 | for i, guard in enumerate(guards): | |
2231 | if guard.startswith('+'): |
|
2231 | if guard.startswith('+'): | |
2232 | ui.write(guard, label='qguard.positive') |
|
2232 | ui.write(guard, label='qguard.positive') | |
2233 | elif guard.startswith('-'): |
|
2233 | elif guard.startswith('-'): | |
2234 | ui.write(guard, label='qguard.negative') |
|
2234 | ui.write(guard, label='qguard.negative') | |
2235 | else: |
|
2235 | else: | |
2236 | ui.write(guard, label='qguard.unguarded') |
|
2236 | ui.write(guard, label='qguard.unguarded') | |
2237 | if i != len(guards) - 1: |
|
2237 | if i != len(guards) - 1: | |
2238 | ui.write(' ') |
|
2238 | ui.write(' ') | |
2239 | ui.write('\n') |
|
2239 | ui.write('\n') | |
2240 | q = repo.mq |
|
2240 | q = repo.mq | |
2241 | applied = set(p.name for p in q.applied) |
|
2241 | applied = set(p.name for p in q.applied) | |
2242 | patch = None |
|
2242 | patch = None | |
2243 | args = list(args) |
|
2243 | args = list(args) | |
2244 | if opts.get('list'): |
|
2244 | if opts.get('list'): | |
2245 | if args or opts.get('none'): |
|
2245 | if args or opts.get('none'): | |
2246 | raise util.Abort(_('cannot mix -l/--list with options or arguments')) |
|
2246 | raise util.Abort(_('cannot mix -l/--list with options or arguments')) | |
2247 | for i in xrange(len(q.series)): |
|
2247 | for i in xrange(len(q.series)): | |
2248 | status(i) |
|
2248 | status(i) | |
2249 | return |
|
2249 | return | |
2250 | if not args or args[0][0:1] in '-+': |
|
2250 | if not args or args[0][0:1] in '-+': | |
2251 | if not q.applied: |
|
2251 | if not q.applied: | |
2252 | raise util.Abort(_('no patches applied')) |
|
2252 | raise util.Abort(_('no patches applied')) | |
2253 | patch = q.applied[-1].name |
|
2253 | patch = q.applied[-1].name | |
2254 | if patch is None and args[0][0:1] not in '-+': |
|
2254 | if patch is None and args[0][0:1] not in '-+': | |
2255 | patch = args.pop(0) |
|
2255 | patch = args.pop(0) | |
2256 | if patch is None: |
|
2256 | if patch is None: | |
2257 | raise util.Abort(_('no patch to work with')) |
|
2257 | raise util.Abort(_('no patch to work with')) | |
2258 | if args or opts.get('none'): |
|
2258 | if args or opts.get('none'): | |
2259 | idx = q.find_series(patch) |
|
2259 | idx = q.find_series(patch) | |
2260 | if idx is None: |
|
2260 | if idx is None: | |
2261 | raise util.Abort(_('no patch named %s') % patch) |
|
2261 | raise util.Abort(_('no patch named %s') % patch) | |
2262 | q.set_guards(idx, args) |
|
2262 | q.set_guards(idx, args) | |
2263 | q.save_dirty() |
|
2263 | q.save_dirty() | |
2264 | else: |
|
2264 | else: | |
2265 | status(q.series.index(q.lookup(patch))) |
|
2265 | status(q.series.index(q.lookup(patch))) | |
2266 |
|
2266 | |||
2267 | def header(ui, repo, patch=None): |
|
2267 | def header(ui, repo, patch=None): | |
2268 | """print the header of the topmost or specified patch |
|
2268 | """print the header of the topmost or specified patch | |
2269 |
|
2269 | |||
2270 | Returns 0 on success.""" |
|
2270 | Returns 0 on success.""" | |
2271 | q = repo.mq |
|
2271 | q = repo.mq | |
2272 |
|
2272 | |||
2273 | if patch: |
|
2273 | if patch: | |
2274 | patch = q.lookup(patch) |
|
2274 | patch = q.lookup(patch) | |
2275 | else: |
|
2275 | else: | |
2276 | if not q.applied: |
|
2276 | if not q.applied: | |
2277 | ui.write(_('no patches applied\n')) |
|
2277 | ui.write(_('no patches applied\n')) | |
2278 | return 1 |
|
2278 | return 1 | |
2279 | patch = q.lookup('qtip') |
|
2279 | patch = q.lookup('qtip') | |
2280 | ph = patchheader(q.join(patch), q.plainmode) |
|
2280 | ph = patchheader(q.join(patch), q.plainmode) | |
2281 |
|
2281 | |||
2282 | ui.write('\n'.join(ph.message) + '\n') |
|
2282 | ui.write('\n'.join(ph.message) + '\n') | |
2283 |
|
2283 | |||
2284 | def lastsavename(path): |
|
2284 | def lastsavename(path): | |
2285 | (directory, base) = os.path.split(path) |
|
2285 | (directory, base) = os.path.split(path) | |
2286 | names = os.listdir(directory) |
|
2286 | names = os.listdir(directory) | |
2287 | namere = re.compile("%s.([0-9]+)" % base) |
|
2287 | namere = re.compile("%s.([0-9]+)" % base) | |
2288 | maxindex = None |
|
2288 | maxindex = None | |
2289 | maxname = None |
|
2289 | maxname = None | |
2290 | for f in names: |
|
2290 | for f in names: | |
2291 | m = namere.match(f) |
|
2291 | m = namere.match(f) | |
2292 | if m: |
|
2292 | if m: | |
2293 | index = int(m.group(1)) |
|
2293 | index = int(m.group(1)) | |
2294 | if maxindex is None or index > maxindex: |
|
2294 | if maxindex is None or index > maxindex: | |
2295 | maxindex = index |
|
2295 | maxindex = index | |
2296 | maxname = f |
|
2296 | maxname = f | |
2297 | if maxname: |
|
2297 | if maxname: | |
2298 | return (os.path.join(directory, maxname), maxindex) |
|
2298 | return (os.path.join(directory, maxname), maxindex) | |
2299 | return (None, None) |
|
2299 | return (None, None) | |
2300 |
|
2300 | |||
2301 | def savename(path): |
|
2301 | def savename(path): | |
2302 | (last, index) = lastsavename(path) |
|
2302 | (last, index) = lastsavename(path) | |
2303 | if last is None: |
|
2303 | if last is None: | |
2304 | index = 0 |
|
2304 | index = 0 | |
2305 | newpath = path + ".%d" % (index + 1) |
|
2305 | newpath = path + ".%d" % (index + 1) | |
2306 | return newpath |
|
2306 | return newpath | |
2307 |
|
2307 | |||
2308 | def push(ui, repo, patch=None, **opts): |
|
2308 | def push(ui, repo, patch=None, **opts): | |
2309 | """push the next patch onto the stack |
|
2309 | """push the next patch onto the stack | |
2310 |
|
2310 | |||
2311 | When -f/--force is applied, all local changes in patched files |
|
2311 | When -f/--force is applied, all local changes in patched files | |
2312 | will be lost. |
|
2312 | will be lost. | |
2313 |
|
2313 | |||
2314 | Return 0 on succces. |
|
2314 | Return 0 on succces. | |
2315 | """ |
|
2315 | """ | |
2316 | q = repo.mq |
|
2316 | q = repo.mq | |
2317 | mergeq = None |
|
2317 | mergeq = None | |
2318 |
|
2318 | |||
2319 | if opts.get('merge'): |
|
2319 | if opts.get('merge'): | |
2320 | if opts.get('name'): |
|
2320 | if opts.get('name'): | |
2321 | newpath = repo.join(opts.get('name')) |
|
2321 | newpath = repo.join(opts.get('name')) | |
2322 | else: |
|
2322 | else: | |
2323 | newpath, i = lastsavename(q.path) |
|
2323 | newpath, i = lastsavename(q.path) | |
2324 | if not newpath: |
|
2324 | if not newpath: | |
2325 | ui.warn(_("no saved queues found, please use -n\n")) |
|
2325 | ui.warn(_("no saved queues found, please use -n\n")) | |
2326 | return 1 |
|
2326 | return 1 | |
2327 | mergeq = queue(ui, repo.join(""), newpath) |
|
2327 | mergeq = queue(ui, repo.join(""), newpath) | |
2328 | ui.warn(_("merging with queue at: %s\n") % mergeq.path) |
|
2328 | ui.warn(_("merging with queue at: %s\n") % mergeq.path) | |
2329 | ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'), |
|
2329 | ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'), | |
2330 | mergeq=mergeq, all=opts.get('all'), move=opts.get('move')) |
|
2330 | mergeq=mergeq, all=opts.get('all'), move=opts.get('move')) | |
2331 | return ret |
|
2331 | return ret | |
2332 |
|
2332 | |||
2333 | def pop(ui, repo, patch=None, **opts): |
|
2333 | def pop(ui, repo, patch=None, **opts): | |
2334 | """pop the current patch off the stack |
|
2334 | """pop the current patch off the stack | |
2335 |
|
2335 | |||
2336 | By default, pops off the top of the patch stack. If given a patch |
|
2336 | By default, pops off the top of the patch stack. If given a patch | |
2337 | name, keeps popping off patches until the named patch is at the |
|
2337 | name, keeps popping off patches until the named patch is at the | |
2338 | top of the stack. |
|
2338 | top of the stack. | |
2339 |
|
2339 | |||
2340 | Return 0 on success. |
|
2340 | Return 0 on success. | |
2341 | """ |
|
2341 | """ | |
2342 | localupdate = True |
|
2342 | localupdate = True | |
2343 | if opts.get('name'): |
|
2343 | if opts.get('name'): | |
2344 | q = queue(ui, repo.join(""), repo.join(opts.get('name'))) |
|
2344 | q = queue(ui, repo.join(""), repo.join(opts.get('name'))) | |
2345 | ui.warn(_('using patch queue: %s\n') % q.path) |
|
2345 | ui.warn(_('using patch queue: %s\n') % q.path) | |
2346 | localupdate = False |
|
2346 | localupdate = False | |
2347 | else: |
|
2347 | else: | |
2348 | q = repo.mq |
|
2348 | q = repo.mq | |
2349 | ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate, |
|
2349 | ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate, | |
2350 | all=opts.get('all')) |
|
2350 | all=opts.get('all')) | |
2351 | q.save_dirty() |
|
2351 | q.save_dirty() | |
2352 | return ret |
|
2352 | return ret | |
2353 |
|
2353 | |||
2354 | def rename(ui, repo, patch, name=None, **opts): |
|
2354 | def rename(ui, repo, patch, name=None, **opts): | |
2355 | """rename a patch |
|
2355 | """rename a patch | |
2356 |
|
2356 | |||
2357 | With one argument, renames the current patch to PATCH1. |
|
2357 | With one argument, renames the current patch to PATCH1. | |
2358 | With two arguments, renames PATCH1 to PATCH2. |
|
2358 | With two arguments, renames PATCH1 to PATCH2. | |
2359 |
|
2359 | |||
2360 | Returns 0 on success.""" |
|
2360 | Returns 0 on success.""" | |
2361 |
|
2361 | |||
2362 | q = repo.mq |
|
2362 | q = repo.mq | |
2363 |
|
2363 | |||
2364 | if not name: |
|
2364 | if not name: | |
2365 | name = patch |
|
2365 | name = patch | |
2366 | patch = None |
|
2366 | patch = None | |
2367 |
|
2367 | |||
2368 | if patch: |
|
2368 | if patch: | |
2369 | patch = q.lookup(patch) |
|
2369 | patch = q.lookup(patch) | |
2370 | else: |
|
2370 | else: | |
2371 | if not q.applied: |
|
2371 | if not q.applied: | |
2372 | ui.write(_('no patches applied\n')) |
|
2372 | ui.write(_('no patches applied\n')) | |
2373 | return |
|
2373 | return | |
2374 | patch = q.lookup('qtip') |
|
2374 | patch = q.lookup('qtip') | |
2375 | absdest = q.join(name) |
|
2375 | absdest = q.join(name) | |
2376 | if os.path.isdir(absdest): |
|
2376 | if os.path.isdir(absdest): | |
2377 | name = normname(os.path.join(name, os.path.basename(patch))) |
|
2377 | name = normname(os.path.join(name, os.path.basename(patch))) | |
2378 | absdest = q.join(name) |
|
2378 | absdest = q.join(name) | |
2379 | if os.path.exists(absdest): |
|
2379 | if os.path.exists(absdest): | |
2380 | raise util.Abort(_('%s already exists') % absdest) |
|
2380 | raise util.Abort(_('%s already exists') % absdest) | |
2381 |
|
2381 | |||
2382 | if name in q.series: |
|
2382 | if name in q.series: | |
2383 | raise util.Abort( |
|
2383 | raise util.Abort( | |
2384 | _('A patch named %s already exists in the series file') % name) |
|
2384 | _('A patch named %s already exists in the series file') % name) | |
2385 |
|
2385 | |||
2386 | ui.note(_('renaming %s to %s\n') % (patch, name)) |
|
2386 | ui.note(_('renaming %s to %s\n') % (patch, name)) | |
2387 | i = q.find_series(patch) |
|
2387 | i = q.find_series(patch) | |
2388 | guards = q.guard_re.findall(q.full_series[i]) |
|
2388 | guards = q.guard_re.findall(q.full_series[i]) | |
2389 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
|
2389 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) | |
2390 | q.parse_series() |
|
2390 | q.parse_series() | |
2391 | q.series_dirty = 1 |
|
2391 | q.series_dirty = 1 | |
2392 |
|
2392 | |||
2393 | info = q.isapplied(patch) |
|
2393 | info = q.isapplied(patch) | |
2394 | if info: |
|
2394 | if info: | |
2395 | q.applied[info[0]] = statusentry(info[1], name) |
|
2395 | q.applied[info[0]] = statusentry(info[1], name) | |
2396 | q.applied_dirty = 1 |
|
2396 | q.applied_dirty = 1 | |
2397 |
|
2397 | |||
2398 | destdir = os.path.dirname(absdest) |
|
2398 | destdir = os.path.dirname(absdest) | |
2399 | if not os.path.isdir(destdir): |
|
2399 | if not os.path.isdir(destdir): | |
2400 | os.makedirs(destdir) |
|
2400 | os.makedirs(destdir) | |
2401 | util.rename(q.join(patch), absdest) |
|
2401 | util.rename(q.join(patch), absdest) | |
2402 | r = q.qrepo() |
|
2402 | r = q.qrepo() | |
2403 | if r: |
|
2403 | if r and patch in r.dirstate: | |
2404 | wctx = r[None] |
|
2404 | wctx = r[None] | |
2405 | wlock = r.wlock() |
|
2405 | wlock = r.wlock() | |
2406 | try: |
|
2406 | try: | |
2407 | if r.dirstate[patch] == 'a': |
|
2407 | if r.dirstate[patch] == 'a': | |
2408 | r.dirstate.forget(patch) |
|
2408 | r.dirstate.forget(patch) | |
2409 | r.dirstate.add(name) |
|
2409 | r.dirstate.add(name) | |
2410 | else: |
|
2410 | else: | |
2411 | if r.dirstate[name] == 'r': |
|
2411 | if r.dirstate[name] == 'r': | |
2412 | wctx.undelete([name]) |
|
2412 | wctx.undelete([name]) | |
2413 | wctx.copy(patch, name) |
|
2413 | wctx.copy(patch, name) | |
2414 | wctx.remove([patch], False) |
|
2414 | wctx.remove([patch], False) | |
2415 | finally: |
|
2415 | finally: | |
2416 | wlock.release() |
|
2416 | wlock.release() | |
2417 |
|
2417 | |||
2418 | q.save_dirty() |
|
2418 | q.save_dirty() | |
2419 |
|
2419 | |||
2420 | def restore(ui, repo, rev, **opts): |
|
2420 | def restore(ui, repo, rev, **opts): | |
2421 | """restore the queue state saved by a revision (DEPRECATED) |
|
2421 | """restore the queue state saved by a revision (DEPRECATED) | |
2422 |
|
2422 | |||
2423 | This command is deprecated, use :hg:`rebase` instead.""" |
|
2423 | This command is deprecated, use :hg:`rebase` instead.""" | |
2424 | rev = repo.lookup(rev) |
|
2424 | rev = repo.lookup(rev) | |
2425 | q = repo.mq |
|
2425 | q = repo.mq | |
2426 | q.restore(repo, rev, delete=opts.get('delete'), |
|
2426 | q.restore(repo, rev, delete=opts.get('delete'), | |
2427 | qupdate=opts.get('update')) |
|
2427 | qupdate=opts.get('update')) | |
2428 | q.save_dirty() |
|
2428 | q.save_dirty() | |
2429 | return 0 |
|
2429 | return 0 | |
2430 |
|
2430 | |||
2431 | def save(ui, repo, **opts): |
|
2431 | def save(ui, repo, **opts): | |
2432 | """save current queue state (DEPRECATED) |
|
2432 | """save current queue state (DEPRECATED) | |
2433 |
|
2433 | |||
2434 | This command is deprecated, use :hg:`rebase` instead.""" |
|
2434 | This command is deprecated, use :hg:`rebase` instead.""" | |
2435 | q = repo.mq |
|
2435 | q = repo.mq | |
2436 | message = cmdutil.logmessage(opts) |
|
2436 | message = cmdutil.logmessage(opts) | |
2437 | ret = q.save(repo, msg=message) |
|
2437 | ret = q.save(repo, msg=message) | |
2438 | if ret: |
|
2438 | if ret: | |
2439 | return ret |
|
2439 | return ret | |
2440 | q.save_dirty() |
|
2440 | q.save_dirty() | |
2441 | if opts.get('copy'): |
|
2441 | if opts.get('copy'): | |
2442 | path = q.path |
|
2442 | path = q.path | |
2443 | if opts.get('name'): |
|
2443 | if opts.get('name'): | |
2444 | newpath = os.path.join(q.basepath, opts.get('name')) |
|
2444 | newpath = os.path.join(q.basepath, opts.get('name')) | |
2445 | if os.path.exists(newpath): |
|
2445 | if os.path.exists(newpath): | |
2446 | if not os.path.isdir(newpath): |
|
2446 | if not os.path.isdir(newpath): | |
2447 | raise util.Abort(_('destination %s exists and is not ' |
|
2447 | raise util.Abort(_('destination %s exists and is not ' | |
2448 | 'a directory') % newpath) |
|
2448 | 'a directory') % newpath) | |
2449 | if not opts.get('force'): |
|
2449 | if not opts.get('force'): | |
2450 | raise util.Abort(_('destination %s exists, ' |
|
2450 | raise util.Abort(_('destination %s exists, ' | |
2451 | 'use -f to force') % newpath) |
|
2451 | 'use -f to force') % newpath) | |
2452 | else: |
|
2452 | else: | |
2453 | newpath = savename(path) |
|
2453 | newpath = savename(path) | |
2454 | ui.warn(_("copy %s to %s\n") % (path, newpath)) |
|
2454 | ui.warn(_("copy %s to %s\n") % (path, newpath)) | |
2455 | util.copyfiles(path, newpath) |
|
2455 | util.copyfiles(path, newpath) | |
2456 | if opts.get('empty'): |
|
2456 | if opts.get('empty'): | |
2457 | try: |
|
2457 | try: | |
2458 | os.unlink(q.join(q.status_path)) |
|
2458 | os.unlink(q.join(q.status_path)) | |
2459 | except: |
|
2459 | except: | |
2460 | pass |
|
2460 | pass | |
2461 | return 0 |
|
2461 | return 0 | |
2462 |
|
2462 | |||
2463 | def strip(ui, repo, *revs, **opts): |
|
2463 | def strip(ui, repo, *revs, **opts): | |
2464 | """strip changesets and all their descendants from the repository |
|
2464 | """strip changesets and all their descendants from the repository | |
2465 |
|
2465 | |||
2466 | The strip command removes the specified changesets and all their |
|
2466 | The strip command removes the specified changesets and all their | |
2467 | descendants. If the working directory has uncommitted changes, |
|
2467 | descendants. If the working directory has uncommitted changes, | |
2468 | the operation is aborted unless the --force flag is supplied. |
|
2468 | the operation is aborted unless the --force flag is supplied. | |
2469 |
|
2469 | |||
2470 | If a parent of the working directory is stripped, then the working |
|
2470 | If a parent of the working directory is stripped, then the working | |
2471 | directory will automatically be updated to the most recent |
|
2471 | directory will automatically be updated to the most recent | |
2472 | available ancestor of the stripped parent after the operation |
|
2472 | available ancestor of the stripped parent after the operation | |
2473 | completes. |
|
2473 | completes. | |
2474 |
|
2474 | |||
2475 | Any stripped changesets are stored in ``.hg/strip-backup`` as a |
|
2475 | Any stripped changesets are stored in ``.hg/strip-backup`` as a | |
2476 | bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can |
|
2476 | bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can | |
2477 | be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, |
|
2477 | be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, | |
2478 | where BUNDLE is the bundle file created by the strip. Note that |
|
2478 | where BUNDLE is the bundle file created by the strip. Note that | |
2479 | the local revision numbers will in general be different after the |
|
2479 | the local revision numbers will in general be different after the | |
2480 | restore. |
|
2480 | restore. | |
2481 |
|
2481 | |||
2482 | Use the --no-backup option to discard the backup bundle once the |
|
2482 | Use the --no-backup option to discard the backup bundle once the | |
2483 | operation completes. |
|
2483 | operation completes. | |
2484 |
|
2484 | |||
2485 | Return 0 on success. |
|
2485 | Return 0 on success. | |
2486 | """ |
|
2486 | """ | |
2487 | backup = 'all' |
|
2487 | backup = 'all' | |
2488 | if opts.get('backup'): |
|
2488 | if opts.get('backup'): | |
2489 | backup = 'strip' |
|
2489 | backup = 'strip' | |
2490 | elif opts.get('no-backup') or opts.get('nobackup'): |
|
2490 | elif opts.get('no-backup') or opts.get('nobackup'): | |
2491 | backup = 'none' |
|
2491 | backup = 'none' | |
2492 |
|
2492 | |||
2493 | cl = repo.changelog |
|
2493 | cl = repo.changelog | |
2494 | revs = set(cmdutil.revrange(repo, revs)) |
|
2494 | revs = set(cmdutil.revrange(repo, revs)) | |
2495 | if not revs: |
|
2495 | if not revs: | |
2496 | raise util.Abort(_('empty revision set')) |
|
2496 | raise util.Abort(_('empty revision set')) | |
2497 |
|
2497 | |||
2498 | descendants = set(cl.descendants(*revs)) |
|
2498 | descendants = set(cl.descendants(*revs)) | |
2499 | strippedrevs = revs.union(descendants) |
|
2499 | strippedrevs = revs.union(descendants) | |
2500 | roots = revs.difference(descendants) |
|
2500 | roots = revs.difference(descendants) | |
2501 |
|
2501 | |||
2502 | update = False |
|
2502 | update = False | |
2503 | # if one of the wdir parent is stripped we'll need |
|
2503 | # if one of the wdir parent is stripped we'll need | |
2504 | # to update away to an earlier revision |
|
2504 | # to update away to an earlier revision | |
2505 | for p in repo.dirstate.parents(): |
|
2505 | for p in repo.dirstate.parents(): | |
2506 | if p != nullid and cl.rev(p) in strippedrevs: |
|
2506 | if p != nullid and cl.rev(p) in strippedrevs: | |
2507 | update = True |
|
2507 | update = True | |
2508 | break |
|
2508 | break | |
2509 |
|
2509 | |||
2510 | rootnodes = set(cl.node(r) for r in roots) |
|
2510 | rootnodes = set(cl.node(r) for r in roots) | |
2511 |
|
2511 | |||
2512 | q = repo.mq |
|
2512 | q = repo.mq | |
2513 | if q.applied: |
|
2513 | if q.applied: | |
2514 | # refresh queue state if we're about to strip |
|
2514 | # refresh queue state if we're about to strip | |
2515 | # applied patches |
|
2515 | # applied patches | |
2516 | if cl.rev(repo.lookup('qtip')) in strippedrevs: |
|
2516 | if cl.rev(repo.lookup('qtip')) in strippedrevs: | |
2517 | q.applied_dirty = True |
|
2517 | q.applied_dirty = True | |
2518 | start = 0 |
|
2518 | start = 0 | |
2519 | end = len(q.applied) |
|
2519 | end = len(q.applied) | |
2520 | for i, statusentry in enumerate(q.applied): |
|
2520 | for i, statusentry in enumerate(q.applied): | |
2521 | if statusentry.node in rootnodes: |
|
2521 | if statusentry.node in rootnodes: | |
2522 | # if one of the stripped roots is an applied |
|
2522 | # if one of the stripped roots is an applied | |
2523 | # patch, only part of the queue is stripped |
|
2523 | # patch, only part of the queue is stripped | |
2524 | start = i |
|
2524 | start = i | |
2525 | break |
|
2525 | break | |
2526 | del q.applied[start:end] |
|
2526 | del q.applied[start:end] | |
2527 | q.save_dirty() |
|
2527 | q.save_dirty() | |
2528 |
|
2528 | |||
2529 | revs = list(rootnodes) |
|
2529 | revs = list(rootnodes) | |
2530 | if update and opts.get('keep'): |
|
2530 | if update and opts.get('keep'): | |
2531 | wlock = repo.wlock() |
|
2531 | wlock = repo.wlock() | |
2532 | try: |
|
2532 | try: | |
2533 | urev = repo.mq.qparents(repo, revs[0]) |
|
2533 | urev = repo.mq.qparents(repo, revs[0]) | |
2534 | repo.dirstate.rebuild(urev, repo[urev].manifest()) |
|
2534 | repo.dirstate.rebuild(urev, repo[urev].manifest()) | |
2535 | repo.dirstate.write() |
|
2535 | repo.dirstate.write() | |
2536 | update = False |
|
2536 | update = False | |
2537 | finally: |
|
2537 | finally: | |
2538 | wlock.release() |
|
2538 | wlock.release() | |
2539 |
|
2539 | |||
2540 | repo.mq.strip(repo, revs, backup=backup, update=update, |
|
2540 | repo.mq.strip(repo, revs, backup=backup, update=update, | |
2541 | force=opts.get('force')) |
|
2541 | force=opts.get('force')) | |
2542 | return 0 |
|
2542 | return 0 | |
2543 |
|
2543 | |||
2544 | def select(ui, repo, *args, **opts): |
|
2544 | def select(ui, repo, *args, **opts): | |
2545 | '''set or print guarded patches to push |
|
2545 | '''set or print guarded patches to push | |
2546 |
|
2546 | |||
2547 | Use the :hg:`qguard` command to set or print guards on patch, then use |
|
2547 | Use the :hg:`qguard` command to set or print guards on patch, then use | |
2548 | qselect to tell mq which guards to use. A patch will be pushed if |
|
2548 | qselect to tell mq which guards to use. A patch will be pushed if | |
2549 | it has no guards or any positive guards match the currently |
|
2549 | it has no guards or any positive guards match the currently | |
2550 | selected guard, but will not be pushed if any negative guards |
|
2550 | selected guard, but will not be pushed if any negative guards | |
2551 | match the current guard. For example:: |
|
2551 | match the current guard. For example:: | |
2552 |
|
2552 | |||
2553 | qguard foo.patch -stable (negative guard) |
|
2553 | qguard foo.patch -stable (negative guard) | |
2554 | qguard bar.patch +stable (positive guard) |
|
2554 | qguard bar.patch +stable (positive guard) | |
2555 | qselect stable |
|
2555 | qselect stable | |
2556 |
|
2556 | |||
2557 | This activates the "stable" guard. mq will skip foo.patch (because |
|
2557 | This activates the "stable" guard. mq will skip foo.patch (because | |
2558 | it has a negative match) but push bar.patch (because it has a |
|
2558 | it has a negative match) but push bar.patch (because it has a | |
2559 | positive match). |
|
2559 | positive match). | |
2560 |
|
2560 | |||
2561 | With no arguments, prints the currently active guards. |
|
2561 | With no arguments, prints the currently active guards. | |
2562 | With one argument, sets the active guard. |
|
2562 | With one argument, sets the active guard. | |
2563 |
|
2563 | |||
2564 | Use -n/--none to deactivate guards (no other arguments needed). |
|
2564 | Use -n/--none to deactivate guards (no other arguments needed). | |
2565 | When no guards are active, patches with positive guards are |
|
2565 | When no guards are active, patches with positive guards are | |
2566 | skipped and patches with negative guards are pushed. |
|
2566 | skipped and patches with negative guards are pushed. | |
2567 |
|
2567 | |||
2568 | qselect can change the guards on applied patches. It does not pop |
|
2568 | qselect can change the guards on applied patches. It does not pop | |
2569 | guarded patches by default. Use --pop to pop back to the last |
|
2569 | guarded patches by default. Use --pop to pop back to the last | |
2570 | applied patch that is not guarded. Use --reapply (which implies |
|
2570 | applied patch that is not guarded. Use --reapply (which implies | |
2571 | --pop) to push back to the current patch afterwards, but skip |
|
2571 | --pop) to push back to the current patch afterwards, but skip | |
2572 | guarded patches. |
|
2572 | guarded patches. | |
2573 |
|
2573 | |||
2574 | Use -s/--series to print a list of all guards in the series file |
|
2574 | Use -s/--series to print a list of all guards in the series file | |
2575 | (no other arguments needed). Use -v for more information. |
|
2575 | (no other arguments needed). Use -v for more information. | |
2576 |
|
2576 | |||
2577 | Returns 0 on success.''' |
|
2577 | Returns 0 on success.''' | |
2578 |
|
2578 | |||
2579 | q = repo.mq |
|
2579 | q = repo.mq | |
2580 | guards = q.active() |
|
2580 | guards = q.active() | |
2581 | if args or opts.get('none'): |
|
2581 | if args or opts.get('none'): | |
2582 | old_unapplied = q.unapplied(repo) |
|
2582 | old_unapplied = q.unapplied(repo) | |
2583 | old_guarded = [i for i in xrange(len(q.applied)) if |
|
2583 | old_guarded = [i for i in xrange(len(q.applied)) if | |
2584 | not q.pushable(i)[0]] |
|
2584 | not q.pushable(i)[0]] | |
2585 | q.set_active(args) |
|
2585 | q.set_active(args) | |
2586 | q.save_dirty() |
|
2586 | q.save_dirty() | |
2587 | if not args: |
|
2587 | if not args: | |
2588 | ui.status(_('guards deactivated\n')) |
|
2588 | ui.status(_('guards deactivated\n')) | |
2589 | if not opts.get('pop') and not opts.get('reapply'): |
|
2589 | if not opts.get('pop') and not opts.get('reapply'): | |
2590 | unapplied = q.unapplied(repo) |
|
2590 | unapplied = q.unapplied(repo) | |
2591 | guarded = [i for i in xrange(len(q.applied)) |
|
2591 | guarded = [i for i in xrange(len(q.applied)) | |
2592 | if not q.pushable(i)[0]] |
|
2592 | if not q.pushable(i)[0]] | |
2593 | if len(unapplied) != len(old_unapplied): |
|
2593 | if len(unapplied) != len(old_unapplied): | |
2594 | ui.status(_('number of unguarded, unapplied patches has ' |
|
2594 | ui.status(_('number of unguarded, unapplied patches has ' | |
2595 | 'changed from %d to %d\n') % |
|
2595 | 'changed from %d to %d\n') % | |
2596 | (len(old_unapplied), len(unapplied))) |
|
2596 | (len(old_unapplied), len(unapplied))) | |
2597 | if len(guarded) != len(old_guarded): |
|
2597 | if len(guarded) != len(old_guarded): | |
2598 | ui.status(_('number of guarded, applied patches has changed ' |
|
2598 | ui.status(_('number of guarded, applied patches has changed ' | |
2599 | 'from %d to %d\n') % |
|
2599 | 'from %d to %d\n') % | |
2600 | (len(old_guarded), len(guarded))) |
|
2600 | (len(old_guarded), len(guarded))) | |
2601 | elif opts.get('series'): |
|
2601 | elif opts.get('series'): | |
2602 | guards = {} |
|
2602 | guards = {} | |
2603 | noguards = 0 |
|
2603 | noguards = 0 | |
2604 | for gs in q.series_guards: |
|
2604 | for gs in q.series_guards: | |
2605 | if not gs: |
|
2605 | if not gs: | |
2606 | noguards += 1 |
|
2606 | noguards += 1 | |
2607 | for g in gs: |
|
2607 | for g in gs: | |
2608 | guards.setdefault(g, 0) |
|
2608 | guards.setdefault(g, 0) | |
2609 | guards[g] += 1 |
|
2609 | guards[g] += 1 | |
2610 | if ui.verbose: |
|
2610 | if ui.verbose: | |
2611 | guards['NONE'] = noguards |
|
2611 | guards['NONE'] = noguards | |
2612 | guards = guards.items() |
|
2612 | guards = guards.items() | |
2613 | guards.sort(key=lambda x: x[0][1:]) |
|
2613 | guards.sort(key=lambda x: x[0][1:]) | |
2614 | if guards: |
|
2614 | if guards: | |
2615 | ui.note(_('guards in series file:\n')) |
|
2615 | ui.note(_('guards in series file:\n')) | |
2616 | for guard, count in guards: |
|
2616 | for guard, count in guards: | |
2617 | ui.note('%2d ' % count) |
|
2617 | ui.note('%2d ' % count) | |
2618 | ui.write(guard, '\n') |
|
2618 | ui.write(guard, '\n') | |
2619 | else: |
|
2619 | else: | |
2620 | ui.note(_('no guards in series file\n')) |
|
2620 | ui.note(_('no guards in series file\n')) | |
2621 | else: |
|
2621 | else: | |
2622 | if guards: |
|
2622 | if guards: | |
2623 | ui.note(_('active guards:\n')) |
|
2623 | ui.note(_('active guards:\n')) | |
2624 | for g in guards: |
|
2624 | for g in guards: | |
2625 | ui.write(g, '\n') |
|
2625 | ui.write(g, '\n') | |
2626 | else: |
|
2626 | else: | |
2627 | ui.write(_('no active guards\n')) |
|
2627 | ui.write(_('no active guards\n')) | |
2628 | reapply = opts.get('reapply') and q.applied and q.appliedname(-1) |
|
2628 | reapply = opts.get('reapply') and q.applied and q.appliedname(-1) | |
2629 | popped = False |
|
2629 | popped = False | |
2630 | if opts.get('pop') or opts.get('reapply'): |
|
2630 | if opts.get('pop') or opts.get('reapply'): | |
2631 | for i in xrange(len(q.applied)): |
|
2631 | for i in xrange(len(q.applied)): | |
2632 | pushable, reason = q.pushable(i) |
|
2632 | pushable, reason = q.pushable(i) | |
2633 | if not pushable: |
|
2633 | if not pushable: | |
2634 | ui.status(_('popping guarded patches\n')) |
|
2634 | ui.status(_('popping guarded patches\n')) | |
2635 | popped = True |
|
2635 | popped = True | |
2636 | if i == 0: |
|
2636 | if i == 0: | |
2637 | q.pop(repo, all=True) |
|
2637 | q.pop(repo, all=True) | |
2638 | else: |
|
2638 | else: | |
2639 | q.pop(repo, i - 1) |
|
2639 | q.pop(repo, i - 1) | |
2640 | break |
|
2640 | break | |
2641 | if popped: |
|
2641 | if popped: | |
2642 | try: |
|
2642 | try: | |
2643 | if reapply: |
|
2643 | if reapply: | |
2644 | ui.status(_('reapplying unguarded patches\n')) |
|
2644 | ui.status(_('reapplying unguarded patches\n')) | |
2645 | q.push(repo, reapply) |
|
2645 | q.push(repo, reapply) | |
2646 | finally: |
|
2646 | finally: | |
2647 | q.save_dirty() |
|
2647 | q.save_dirty() | |
2648 |
|
2648 | |||
2649 | def finish(ui, repo, *revrange, **opts): |
|
2649 | def finish(ui, repo, *revrange, **opts): | |
2650 | """move applied patches into repository history |
|
2650 | """move applied patches into repository history | |
2651 |
|
2651 | |||
2652 | Finishes the specified revisions (corresponding to applied |
|
2652 | Finishes the specified revisions (corresponding to applied | |
2653 | patches) by moving them out of mq control into regular repository |
|
2653 | patches) by moving them out of mq control into regular repository | |
2654 | history. |
|
2654 | history. | |
2655 |
|
2655 | |||
2656 | Accepts a revision range or the -a/--applied option. If --applied |
|
2656 | Accepts a revision range or the -a/--applied option. If --applied | |
2657 | is specified, all applied mq revisions are removed from mq |
|
2657 | is specified, all applied mq revisions are removed from mq | |
2658 | control. Otherwise, the given revisions must be at the base of the |
|
2658 | control. Otherwise, the given revisions must be at the base of the | |
2659 | stack of applied patches. |
|
2659 | stack of applied patches. | |
2660 |
|
2660 | |||
2661 | This can be especially useful if your changes have been applied to |
|
2661 | This can be especially useful if your changes have been applied to | |
2662 | an upstream repository, or if you are about to push your changes |
|
2662 | an upstream repository, or if you are about to push your changes | |
2663 | to upstream. |
|
2663 | to upstream. | |
2664 |
|
2664 | |||
2665 | Returns 0 on success. |
|
2665 | Returns 0 on success. | |
2666 | """ |
|
2666 | """ | |
2667 | if not opts.get('applied') and not revrange: |
|
2667 | if not opts.get('applied') and not revrange: | |
2668 | raise util.Abort(_('no revisions specified')) |
|
2668 | raise util.Abort(_('no revisions specified')) | |
2669 | elif opts.get('applied'): |
|
2669 | elif opts.get('applied'): | |
2670 | revrange = ('qbase::qtip',) + revrange |
|
2670 | revrange = ('qbase::qtip',) + revrange | |
2671 |
|
2671 | |||
2672 | q = repo.mq |
|
2672 | q = repo.mq | |
2673 | if not q.applied: |
|
2673 | if not q.applied: | |
2674 | ui.status(_('no patches applied\n')) |
|
2674 | ui.status(_('no patches applied\n')) | |
2675 | return 0 |
|
2675 | return 0 | |
2676 |
|
2676 | |||
2677 | revs = cmdutil.revrange(repo, revrange) |
|
2677 | revs = cmdutil.revrange(repo, revrange) | |
2678 | q.finish(repo, revs) |
|
2678 | q.finish(repo, revs) | |
2679 | q.save_dirty() |
|
2679 | q.save_dirty() | |
2680 | return 0 |
|
2680 | return 0 | |
2681 |
|
2681 | |||
2682 | def qqueue(ui, repo, name=None, **opts): |
|
2682 | def qqueue(ui, repo, name=None, **opts): | |
2683 | '''manage multiple patch queues |
|
2683 | '''manage multiple patch queues | |
2684 |
|
2684 | |||
2685 | Supports switching between different patch queues, as well as creating |
|
2685 | Supports switching between different patch queues, as well as creating | |
2686 | new patch queues and deleting existing ones. |
|
2686 | new patch queues and deleting existing ones. | |
2687 |
|
2687 | |||
2688 | Omitting a queue name or specifying -l/--list will show you the registered |
|
2688 | Omitting a queue name or specifying -l/--list will show you the registered | |
2689 | queues - by default the "normal" patches queue is registered. The currently |
|
2689 | queues - by default the "normal" patches queue is registered. The currently | |
2690 | active queue will be marked with "(active)". |
|
2690 | active queue will be marked with "(active)". | |
2691 |
|
2691 | |||
2692 | To create a new queue, use -c/--create. The queue is automatically made |
|
2692 | To create a new queue, use -c/--create. The queue is automatically made | |
2693 | active, except in the case where there are applied patches from the |
|
2693 | active, except in the case where there are applied patches from the | |
2694 | currently active queue in the repository. Then the queue will only be |
|
2694 | currently active queue in the repository. Then the queue will only be | |
2695 | created and switching will fail. |
|
2695 | created and switching will fail. | |
2696 |
|
2696 | |||
2697 | To delete an existing queue, use --delete. You cannot delete the currently |
|
2697 | To delete an existing queue, use --delete. You cannot delete the currently | |
2698 | active queue. |
|
2698 | active queue. | |
2699 |
|
2699 | |||
2700 | Returns 0 on success. |
|
2700 | Returns 0 on success. | |
2701 | ''' |
|
2701 | ''' | |
2702 |
|
2702 | |||
2703 | q = repo.mq |
|
2703 | q = repo.mq | |
2704 |
|
2704 | |||
2705 | _defaultqueue = 'patches' |
|
2705 | _defaultqueue = 'patches' | |
2706 | _allqueues = 'patches.queues' |
|
2706 | _allqueues = 'patches.queues' | |
2707 | _activequeue = 'patches.queue' |
|
2707 | _activequeue = 'patches.queue' | |
2708 |
|
2708 | |||
2709 | def _getcurrent(): |
|
2709 | def _getcurrent(): | |
2710 | cur = os.path.basename(q.path) |
|
2710 | cur = os.path.basename(q.path) | |
2711 | if cur.startswith('patches-'): |
|
2711 | if cur.startswith('patches-'): | |
2712 | cur = cur[8:] |
|
2712 | cur = cur[8:] | |
2713 | return cur |
|
2713 | return cur | |
2714 |
|
2714 | |||
2715 | def _noqueues(): |
|
2715 | def _noqueues(): | |
2716 | try: |
|
2716 | try: | |
2717 | fh = repo.opener(_allqueues, 'r') |
|
2717 | fh = repo.opener(_allqueues, 'r') | |
2718 | fh.close() |
|
2718 | fh.close() | |
2719 | except IOError: |
|
2719 | except IOError: | |
2720 | return True |
|
2720 | return True | |
2721 |
|
2721 | |||
2722 | return False |
|
2722 | return False | |
2723 |
|
2723 | |||
2724 | def _getqueues(): |
|
2724 | def _getqueues(): | |
2725 | current = _getcurrent() |
|
2725 | current = _getcurrent() | |
2726 |
|
2726 | |||
2727 | try: |
|
2727 | try: | |
2728 | fh = repo.opener(_allqueues, 'r') |
|
2728 | fh = repo.opener(_allqueues, 'r') | |
2729 | queues = [queue.strip() for queue in fh if queue.strip()] |
|
2729 | queues = [queue.strip() for queue in fh if queue.strip()] | |
2730 | if current not in queues: |
|
2730 | if current not in queues: | |
2731 | queues.append(current) |
|
2731 | queues.append(current) | |
2732 | except IOError: |
|
2732 | except IOError: | |
2733 | queues = [_defaultqueue] |
|
2733 | queues = [_defaultqueue] | |
2734 |
|
2734 | |||
2735 | return sorted(queues) |
|
2735 | return sorted(queues) | |
2736 |
|
2736 | |||
2737 | def _setactive(name): |
|
2737 | def _setactive(name): | |
2738 | if q.applied: |
|
2738 | if q.applied: | |
2739 | raise util.Abort(_('patches applied - cannot set new queue active')) |
|
2739 | raise util.Abort(_('patches applied - cannot set new queue active')) | |
2740 | _setactivenocheck(name) |
|
2740 | _setactivenocheck(name) | |
2741 |
|
2741 | |||
2742 | def _setactivenocheck(name): |
|
2742 | def _setactivenocheck(name): | |
2743 | fh = repo.opener(_activequeue, 'w') |
|
2743 | fh = repo.opener(_activequeue, 'w') | |
2744 | if name != 'patches': |
|
2744 | if name != 'patches': | |
2745 | fh.write(name) |
|
2745 | fh.write(name) | |
2746 | fh.close() |
|
2746 | fh.close() | |
2747 |
|
2747 | |||
2748 | def _addqueue(name): |
|
2748 | def _addqueue(name): | |
2749 | fh = repo.opener(_allqueues, 'a') |
|
2749 | fh = repo.opener(_allqueues, 'a') | |
2750 | fh.write('%s\n' % (name,)) |
|
2750 | fh.write('%s\n' % (name,)) | |
2751 | fh.close() |
|
2751 | fh.close() | |
2752 |
|
2752 | |||
2753 | def _queuedir(name): |
|
2753 | def _queuedir(name): | |
2754 | if name == 'patches': |
|
2754 | if name == 'patches': | |
2755 | return repo.join('patches') |
|
2755 | return repo.join('patches') | |
2756 | else: |
|
2756 | else: | |
2757 | return repo.join('patches-' + name) |
|
2757 | return repo.join('patches-' + name) | |
2758 |
|
2758 | |||
2759 | def _validname(name): |
|
2759 | def _validname(name): | |
2760 | for n in name: |
|
2760 | for n in name: | |
2761 | if n in ':\\/.': |
|
2761 | if n in ':\\/.': | |
2762 | return False |
|
2762 | return False | |
2763 | return True |
|
2763 | return True | |
2764 |
|
2764 | |||
2765 | def _delete(name): |
|
2765 | def _delete(name): | |
2766 | if name not in existing: |
|
2766 | if name not in existing: | |
2767 | raise util.Abort(_('cannot delete queue that does not exist')) |
|
2767 | raise util.Abort(_('cannot delete queue that does not exist')) | |
2768 |
|
2768 | |||
2769 | current = _getcurrent() |
|
2769 | current = _getcurrent() | |
2770 |
|
2770 | |||
2771 | if name == current: |
|
2771 | if name == current: | |
2772 | raise util.Abort(_('cannot delete currently active queue')) |
|
2772 | raise util.Abort(_('cannot delete currently active queue')) | |
2773 |
|
2773 | |||
2774 | fh = repo.opener('patches.queues.new', 'w') |
|
2774 | fh = repo.opener('patches.queues.new', 'w') | |
2775 | for queue in existing: |
|
2775 | for queue in existing: | |
2776 | if queue == name: |
|
2776 | if queue == name: | |
2777 | continue |
|
2777 | continue | |
2778 | fh.write('%s\n' % (queue,)) |
|
2778 | fh.write('%s\n' % (queue,)) | |
2779 | fh.close() |
|
2779 | fh.close() | |
2780 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) |
|
2780 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) | |
2781 |
|
2781 | |||
2782 | if not name or opts.get('list'): |
|
2782 | if not name or opts.get('list'): | |
2783 | current = _getcurrent() |
|
2783 | current = _getcurrent() | |
2784 | for queue in _getqueues(): |
|
2784 | for queue in _getqueues(): | |
2785 | ui.write('%s' % (queue,)) |
|
2785 | ui.write('%s' % (queue,)) | |
2786 | if queue == current and not ui.quiet: |
|
2786 | if queue == current and not ui.quiet: | |
2787 | ui.write(_(' (active)\n')) |
|
2787 | ui.write(_(' (active)\n')) | |
2788 | else: |
|
2788 | else: | |
2789 | ui.write('\n') |
|
2789 | ui.write('\n') | |
2790 | return |
|
2790 | return | |
2791 |
|
2791 | |||
2792 | if not _validname(name): |
|
2792 | if not _validname(name): | |
2793 | raise util.Abort( |
|
2793 | raise util.Abort( | |
2794 | _('invalid queue name, may not contain the characters ":\\/."')) |
|
2794 | _('invalid queue name, may not contain the characters ":\\/."')) | |
2795 |
|
2795 | |||
2796 | existing = _getqueues() |
|
2796 | existing = _getqueues() | |
2797 |
|
2797 | |||
2798 | if opts.get('create'): |
|
2798 | if opts.get('create'): | |
2799 | if name in existing: |
|
2799 | if name in existing: | |
2800 | raise util.Abort(_('queue "%s" already exists') % name) |
|
2800 | raise util.Abort(_('queue "%s" already exists') % name) | |
2801 | if _noqueues(): |
|
2801 | if _noqueues(): | |
2802 | _addqueue(_defaultqueue) |
|
2802 | _addqueue(_defaultqueue) | |
2803 | _addqueue(name) |
|
2803 | _addqueue(name) | |
2804 | _setactive(name) |
|
2804 | _setactive(name) | |
2805 | elif opts.get('rename'): |
|
2805 | elif opts.get('rename'): | |
2806 | current = _getcurrent() |
|
2806 | current = _getcurrent() | |
2807 | if name == current: |
|
2807 | if name == current: | |
2808 | raise util.Abort(_('can\'t rename "%s" to its current name') % name) |
|
2808 | raise util.Abort(_('can\'t rename "%s" to its current name') % name) | |
2809 | if name in existing: |
|
2809 | if name in existing: | |
2810 | raise util.Abort(_('queue "%s" already exists') % name) |
|
2810 | raise util.Abort(_('queue "%s" already exists') % name) | |
2811 |
|
2811 | |||
2812 | olddir = _queuedir(current) |
|
2812 | olddir = _queuedir(current) | |
2813 | newdir = _queuedir(name) |
|
2813 | newdir = _queuedir(name) | |
2814 |
|
2814 | |||
2815 | if os.path.exists(newdir): |
|
2815 | if os.path.exists(newdir): | |
2816 | raise util.Abort(_('non-queue directory "%s" already exists') % |
|
2816 | raise util.Abort(_('non-queue directory "%s" already exists') % | |
2817 | newdir) |
|
2817 | newdir) | |
2818 |
|
2818 | |||
2819 | fh = repo.opener('patches.queues.new', 'w') |
|
2819 | fh = repo.opener('patches.queues.new', 'w') | |
2820 | for queue in existing: |
|
2820 | for queue in existing: | |
2821 | if queue == current: |
|
2821 | if queue == current: | |
2822 | fh.write('%s\n' % (name,)) |
|
2822 | fh.write('%s\n' % (name,)) | |
2823 | if os.path.exists(olddir): |
|
2823 | if os.path.exists(olddir): | |
2824 | util.rename(olddir, newdir) |
|
2824 | util.rename(olddir, newdir) | |
2825 | else: |
|
2825 | else: | |
2826 | fh.write('%s\n' % (queue,)) |
|
2826 | fh.write('%s\n' % (queue,)) | |
2827 | fh.close() |
|
2827 | fh.close() | |
2828 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) |
|
2828 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) | |
2829 | _setactivenocheck(name) |
|
2829 | _setactivenocheck(name) | |
2830 | elif opts.get('delete'): |
|
2830 | elif opts.get('delete'): | |
2831 | _delete(name) |
|
2831 | _delete(name) | |
2832 | elif opts.get('purge'): |
|
2832 | elif opts.get('purge'): | |
2833 | if name in existing: |
|
2833 | if name in existing: | |
2834 | _delete(name) |
|
2834 | _delete(name) | |
2835 | qdir = _queuedir(name) |
|
2835 | qdir = _queuedir(name) | |
2836 | if os.path.exists(qdir): |
|
2836 | if os.path.exists(qdir): | |
2837 | shutil.rmtree(qdir) |
|
2837 | shutil.rmtree(qdir) | |
2838 | else: |
|
2838 | else: | |
2839 | if name not in existing: |
|
2839 | if name not in existing: | |
2840 | raise util.Abort(_('use --create to create a new queue')) |
|
2840 | raise util.Abort(_('use --create to create a new queue')) | |
2841 | _setactive(name) |
|
2841 | _setactive(name) | |
2842 |
|
2842 | |||
2843 | def reposetup(ui, repo): |
|
2843 | def reposetup(ui, repo): | |
2844 | class mqrepo(repo.__class__): |
|
2844 | class mqrepo(repo.__class__): | |
2845 | @util.propertycache |
|
2845 | @util.propertycache | |
2846 | def mq(self): |
|
2846 | def mq(self): | |
2847 | return queue(self.ui, self.join("")) |
|
2847 | return queue(self.ui, self.join("")) | |
2848 |
|
2848 | |||
2849 | def abort_if_wdir_patched(self, errmsg, force=False): |
|
2849 | def abort_if_wdir_patched(self, errmsg, force=False): | |
2850 | if self.mq.applied and not force: |
|
2850 | if self.mq.applied and not force: | |
2851 | parent = self.dirstate.parents()[0] |
|
2851 | parent = self.dirstate.parents()[0] | |
2852 | if parent in [s.node for s in self.mq.applied]: |
|
2852 | if parent in [s.node for s in self.mq.applied]: | |
2853 | raise util.Abort(errmsg) |
|
2853 | raise util.Abort(errmsg) | |
2854 |
|
2854 | |||
2855 | def commit(self, text="", user=None, date=None, match=None, |
|
2855 | def commit(self, text="", user=None, date=None, match=None, | |
2856 | force=False, editor=False, extra={}): |
|
2856 | force=False, editor=False, extra={}): | |
2857 | self.abort_if_wdir_patched( |
|
2857 | self.abort_if_wdir_patched( | |
2858 | _('cannot commit over an applied mq patch'), |
|
2858 | _('cannot commit over an applied mq patch'), | |
2859 | force) |
|
2859 | force) | |
2860 |
|
2860 | |||
2861 | return super(mqrepo, self).commit(text, user, date, match, force, |
|
2861 | return super(mqrepo, self).commit(text, user, date, match, force, | |
2862 | editor, extra) |
|
2862 | editor, extra) | |
2863 |
|
2863 | |||
2864 | def push(self, remote, force=False, revs=None, newbranch=False): |
|
2864 | def push(self, remote, force=False, revs=None, newbranch=False): | |
2865 | if self.mq.applied and not force: |
|
2865 | if self.mq.applied and not force: | |
2866 | haspatches = True |
|
2866 | haspatches = True | |
2867 | if revs: |
|
2867 | if revs: | |
2868 | # Assume applied patches have no non-patch descendants |
|
2868 | # Assume applied patches have no non-patch descendants | |
2869 | # and are not on remote already. If they appear in the |
|
2869 | # and are not on remote already. If they appear in the | |
2870 | # set of resolved 'revs', bail out. |
|
2870 | # set of resolved 'revs', bail out. | |
2871 | applied = set(e.node for e in self.mq.applied) |
|
2871 | applied = set(e.node for e in self.mq.applied) | |
2872 | haspatches = bool([n for n in revs if n in applied]) |
|
2872 | haspatches = bool([n for n in revs if n in applied]) | |
2873 | if haspatches: |
|
2873 | if haspatches: | |
2874 | raise util.Abort(_('source has mq patches applied')) |
|
2874 | raise util.Abort(_('source has mq patches applied')) | |
2875 | return super(mqrepo, self).push(remote, force, revs, newbranch) |
|
2875 | return super(mqrepo, self).push(remote, force, revs, newbranch) | |
2876 |
|
2876 | |||
2877 | def _findtags(self): |
|
2877 | def _findtags(self): | |
2878 | '''augment tags from base class with patch tags''' |
|
2878 | '''augment tags from base class with patch tags''' | |
2879 | result = super(mqrepo, self)._findtags() |
|
2879 | result = super(mqrepo, self)._findtags() | |
2880 |
|
2880 | |||
2881 | q = self.mq |
|
2881 | q = self.mq | |
2882 | if not q.applied: |
|
2882 | if not q.applied: | |
2883 | return result |
|
2883 | return result | |
2884 |
|
2884 | |||
2885 | mqtags = [(patch.node, patch.name) for patch in q.applied] |
|
2885 | mqtags = [(patch.node, patch.name) for patch in q.applied] | |
2886 |
|
2886 | |||
2887 | if mqtags[-1][0] not in self.changelog.nodemap: |
|
2887 | if mqtags[-1][0] not in self.changelog.nodemap: | |
2888 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
2888 | self.ui.warn(_('mq status file refers to unknown node %s\n') | |
2889 | % short(mqtags[-1][0])) |
|
2889 | % short(mqtags[-1][0])) | |
2890 | return result |
|
2890 | return result | |
2891 |
|
2891 | |||
2892 | mqtags.append((mqtags[-1][0], 'qtip')) |
|
2892 | mqtags.append((mqtags[-1][0], 'qtip')) | |
2893 | mqtags.append((mqtags[0][0], 'qbase')) |
|
2893 | mqtags.append((mqtags[0][0], 'qbase')) | |
2894 | mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) |
|
2894 | mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) | |
2895 | tags = result[0] |
|
2895 | tags = result[0] | |
2896 | for patch in mqtags: |
|
2896 | for patch in mqtags: | |
2897 | if patch[1] in tags: |
|
2897 | if patch[1] in tags: | |
2898 | self.ui.warn(_('Tag %s overrides mq patch of the same name\n') |
|
2898 | self.ui.warn(_('Tag %s overrides mq patch of the same name\n') | |
2899 | % patch[1]) |
|
2899 | % patch[1]) | |
2900 | else: |
|
2900 | else: | |
2901 | tags[patch[1]] = patch[0] |
|
2901 | tags[patch[1]] = patch[0] | |
2902 |
|
2902 | |||
2903 | return result |
|
2903 | return result | |
2904 |
|
2904 | |||
2905 | def _branchtags(self, partial, lrev): |
|
2905 | def _branchtags(self, partial, lrev): | |
2906 | q = self.mq |
|
2906 | q = self.mq | |
2907 | if not q.applied: |
|
2907 | if not q.applied: | |
2908 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
2908 | return super(mqrepo, self)._branchtags(partial, lrev) | |
2909 |
|
2909 | |||
2910 | cl = self.changelog |
|
2910 | cl = self.changelog | |
2911 | qbasenode = q.applied[0].node |
|
2911 | qbasenode = q.applied[0].node | |
2912 | if qbasenode not in cl.nodemap: |
|
2912 | if qbasenode not in cl.nodemap: | |
2913 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
2913 | self.ui.warn(_('mq status file refers to unknown node %s\n') | |
2914 | % short(qbasenode)) |
|
2914 | % short(qbasenode)) | |
2915 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
2915 | return super(mqrepo, self)._branchtags(partial, lrev) | |
2916 |
|
2916 | |||
2917 | qbase = cl.rev(qbasenode) |
|
2917 | qbase = cl.rev(qbasenode) | |
2918 | start = lrev + 1 |
|
2918 | start = lrev + 1 | |
2919 | if start < qbase: |
|
2919 | if start < qbase: | |
2920 | # update the cache (excluding the patches) and save it |
|
2920 | # update the cache (excluding the patches) and save it | |
2921 | ctxgen = (self[r] for r in xrange(lrev + 1, qbase)) |
|
2921 | ctxgen = (self[r] for r in xrange(lrev + 1, qbase)) | |
2922 | self._updatebranchcache(partial, ctxgen) |
|
2922 | self._updatebranchcache(partial, ctxgen) | |
2923 | self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) |
|
2923 | self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) | |
2924 | start = qbase |
|
2924 | start = qbase | |
2925 | # if start = qbase, the cache is as updated as it should be. |
|
2925 | # if start = qbase, the cache is as updated as it should be. | |
2926 | # if start > qbase, the cache includes (part of) the patches. |
|
2926 | # if start > qbase, the cache includes (part of) the patches. | |
2927 | # we might as well use it, but we won't save it. |
|
2927 | # we might as well use it, but we won't save it. | |
2928 |
|
2928 | |||
2929 | # update the cache up to the tip |
|
2929 | # update the cache up to the tip | |
2930 | ctxgen = (self[r] for r in xrange(start, len(cl))) |
|
2930 | ctxgen = (self[r] for r in xrange(start, len(cl))) | |
2931 | self._updatebranchcache(partial, ctxgen) |
|
2931 | self._updatebranchcache(partial, ctxgen) | |
2932 |
|
2932 | |||
2933 | return partial |
|
2933 | return partial | |
2934 |
|
2934 | |||
2935 | if repo.local(): |
|
2935 | if repo.local(): | |
2936 | repo.__class__ = mqrepo |
|
2936 | repo.__class__ = mqrepo | |
2937 |
|
2937 | |||
2938 | def mqimport(orig, ui, repo, *args, **kwargs): |
|
2938 | def mqimport(orig, ui, repo, *args, **kwargs): | |
2939 | if (hasattr(repo, 'abort_if_wdir_patched') |
|
2939 | if (hasattr(repo, 'abort_if_wdir_patched') | |
2940 | and not kwargs.get('no_commit', False)): |
|
2940 | and not kwargs.get('no_commit', False)): | |
2941 | repo.abort_if_wdir_patched(_('cannot import over an applied patch'), |
|
2941 | repo.abort_if_wdir_patched(_('cannot import over an applied patch'), | |
2942 | kwargs.get('force')) |
|
2942 | kwargs.get('force')) | |
2943 | return orig(ui, repo, *args, **kwargs) |
|
2943 | return orig(ui, repo, *args, **kwargs) | |
2944 |
|
2944 | |||
2945 | def mqinit(orig, ui, *args, **kwargs): |
|
2945 | def mqinit(orig, ui, *args, **kwargs): | |
2946 | mq = kwargs.pop('mq', None) |
|
2946 | mq = kwargs.pop('mq', None) | |
2947 |
|
2947 | |||
2948 | if not mq: |
|
2948 | if not mq: | |
2949 | return orig(ui, *args, **kwargs) |
|
2949 | return orig(ui, *args, **kwargs) | |
2950 |
|
2950 | |||
2951 | if args: |
|
2951 | if args: | |
2952 | repopath = args[0] |
|
2952 | repopath = args[0] | |
2953 | if not hg.islocal(repopath): |
|
2953 | if not hg.islocal(repopath): | |
2954 | raise util.Abort(_('only a local queue repository ' |
|
2954 | raise util.Abort(_('only a local queue repository ' | |
2955 | 'may be initialized')) |
|
2955 | 'may be initialized')) | |
2956 | else: |
|
2956 | else: | |
2957 | repopath = cmdutil.findrepo(os.getcwd()) |
|
2957 | repopath = cmdutil.findrepo(os.getcwd()) | |
2958 | if not repopath: |
|
2958 | if not repopath: | |
2959 | raise util.Abort(_('there is no Mercurial repository here ' |
|
2959 | raise util.Abort(_('there is no Mercurial repository here ' | |
2960 | '(.hg not found)')) |
|
2960 | '(.hg not found)')) | |
2961 | repo = hg.repository(ui, repopath) |
|
2961 | repo = hg.repository(ui, repopath) | |
2962 | return qinit(ui, repo, True) |
|
2962 | return qinit(ui, repo, True) | |
2963 |
|
2963 | |||
2964 | def mqcommand(orig, ui, repo, *args, **kwargs): |
|
2964 | def mqcommand(orig, ui, repo, *args, **kwargs): | |
2965 | """Add --mq option to operate on patch repository instead of main""" |
|
2965 | """Add --mq option to operate on patch repository instead of main""" | |
2966 |
|
2966 | |||
2967 | # some commands do not like getting unknown options |
|
2967 | # some commands do not like getting unknown options | |
2968 | mq = kwargs.pop('mq', None) |
|
2968 | mq = kwargs.pop('mq', None) | |
2969 |
|
2969 | |||
2970 | if not mq: |
|
2970 | if not mq: | |
2971 | return orig(ui, repo, *args, **kwargs) |
|
2971 | return orig(ui, repo, *args, **kwargs) | |
2972 |
|
2972 | |||
2973 | q = repo.mq |
|
2973 | q = repo.mq | |
2974 | r = q.qrepo() |
|
2974 | r = q.qrepo() | |
2975 | if not r: |
|
2975 | if not r: | |
2976 | raise util.Abort(_('no queue repository')) |
|
2976 | raise util.Abort(_('no queue repository')) | |
2977 | return orig(r.ui, r, *args, **kwargs) |
|
2977 | return orig(r.ui, r, *args, **kwargs) | |
2978 |
|
2978 | |||
2979 | def summary(orig, ui, repo, *args, **kwargs): |
|
2979 | def summary(orig, ui, repo, *args, **kwargs): | |
2980 | r = orig(ui, repo, *args, **kwargs) |
|
2980 | r = orig(ui, repo, *args, **kwargs) | |
2981 | q = repo.mq |
|
2981 | q = repo.mq | |
2982 | m = [] |
|
2982 | m = [] | |
2983 | a, u = len(q.applied), len(q.unapplied(repo)) |
|
2983 | a, u = len(q.applied), len(q.unapplied(repo)) | |
2984 | if a: |
|
2984 | if a: | |
2985 | m.append(ui.label(_("%d applied"), 'qseries.applied') % a) |
|
2985 | m.append(ui.label(_("%d applied"), 'qseries.applied') % a) | |
2986 | if u: |
|
2986 | if u: | |
2987 | m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u) |
|
2987 | m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u) | |
2988 | if m: |
|
2988 | if m: | |
2989 | ui.write("mq: %s\n" % ', '.join(m)) |
|
2989 | ui.write("mq: %s\n" % ', '.join(m)) | |
2990 | else: |
|
2990 | else: | |
2991 | ui.note(_("mq: (empty queue)\n")) |
|
2991 | ui.note(_("mq: (empty queue)\n")) | |
2992 | return r |
|
2992 | return r | |
2993 |
|
2993 | |||
2994 | def uisetup(ui): |
|
2994 | def uisetup(ui): | |
2995 | mqopt = [('', 'mq', None, _("operate on patch repository"))] |
|
2995 | mqopt = [('', 'mq', None, _("operate on patch repository"))] | |
2996 |
|
2996 | |||
2997 | extensions.wrapcommand(commands.table, 'import', mqimport) |
|
2997 | extensions.wrapcommand(commands.table, 'import', mqimport) | |
2998 | extensions.wrapcommand(commands.table, 'summary', summary) |
|
2998 | extensions.wrapcommand(commands.table, 'summary', summary) | |
2999 |
|
2999 | |||
3000 | entry = extensions.wrapcommand(commands.table, 'init', mqinit) |
|
3000 | entry = extensions.wrapcommand(commands.table, 'init', mqinit) | |
3001 | entry[1].extend(mqopt) |
|
3001 | entry[1].extend(mqopt) | |
3002 |
|
3002 | |||
3003 | nowrap = set(commands.norepo.split(" ") + ['qrecord']) |
|
3003 | nowrap = set(commands.norepo.split(" ") + ['qrecord']) | |
3004 |
|
3004 | |||
3005 | def dotable(cmdtable): |
|
3005 | def dotable(cmdtable): | |
3006 | for cmd in cmdtable.keys(): |
|
3006 | for cmd in cmdtable.keys(): | |
3007 | cmd = cmdutil.parsealiases(cmd)[0] |
|
3007 | cmd = cmdutil.parsealiases(cmd)[0] | |
3008 | if cmd in nowrap: |
|
3008 | if cmd in nowrap: | |
3009 | continue |
|
3009 | continue | |
3010 | entry = extensions.wrapcommand(cmdtable, cmd, mqcommand) |
|
3010 | entry = extensions.wrapcommand(cmdtable, cmd, mqcommand) | |
3011 | entry[1].extend(mqopt) |
|
3011 | entry[1].extend(mqopt) | |
3012 |
|
3012 | |||
3013 | dotable(commands.table) |
|
3013 | dotable(commands.table) | |
3014 |
|
3014 | |||
3015 | for extname, extmodule in extensions.extensions(): |
|
3015 | for extname, extmodule in extensions.extensions(): | |
3016 | if extmodule.__file__ != __file__: |
|
3016 | if extmodule.__file__ != __file__: | |
3017 | dotable(getattr(extmodule, 'cmdtable', {})) |
|
3017 | dotable(getattr(extmodule, 'cmdtable', {})) | |
3018 |
|
3018 | |||
3019 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
3019 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] | |
3020 |
|
3020 | |||
3021 | cmdtable = { |
|
3021 | cmdtable = { | |
3022 | "qapplied": |
|
3022 | "qapplied": | |
3023 | (applied, |
|
3023 | (applied, | |
3024 | [('1', 'last', None, _('show only the last patch'))] + seriesopts, |
|
3024 | [('1', 'last', None, _('show only the last patch'))] + seriesopts, | |
3025 | _('hg qapplied [-1] [-s] [PATCH]')), |
|
3025 | _('hg qapplied [-1] [-s] [PATCH]')), | |
3026 | "qclone": |
|
3026 | "qclone": | |
3027 | (clone, |
|
3027 | (clone, | |
3028 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
3028 | [('', 'pull', None, _('use pull protocol to copy metadata')), | |
3029 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
3029 | ('U', 'noupdate', None, _('do not update the new working directories')), | |
3030 | ('', 'uncompressed', None, |
|
3030 | ('', 'uncompressed', None, | |
3031 | _('use uncompressed transfer (fast over LAN)')), |
|
3031 | _('use uncompressed transfer (fast over LAN)')), | |
3032 | ('p', 'patches', '', |
|
3032 | ('p', 'patches', '', | |
3033 | _('location of source patch repository'), _('REPO')), |
|
3033 | _('location of source patch repository'), _('REPO')), | |
3034 | ] + commands.remoteopts, |
|
3034 | ] + commands.remoteopts, | |
3035 | _('hg qclone [OPTION]... SOURCE [DEST]')), |
|
3035 | _('hg qclone [OPTION]... SOURCE [DEST]')), | |
3036 | "qcommit|qci": |
|
3036 | "qcommit|qci": | |
3037 | (commit, |
|
3037 | (commit, | |
3038 | commands.table["^commit|ci"][1], |
|
3038 | commands.table["^commit|ci"][1], | |
3039 | _('hg qcommit [OPTION]... [FILE]...')), |
|
3039 | _('hg qcommit [OPTION]... [FILE]...')), | |
3040 | "^qdiff": |
|
3040 | "^qdiff": | |
3041 | (diff, |
|
3041 | (diff, | |
3042 | commands.diffopts + commands.diffopts2 + commands.walkopts, |
|
3042 | commands.diffopts + commands.diffopts2 + commands.walkopts, | |
3043 | _('hg qdiff [OPTION]... [FILE]...')), |
|
3043 | _('hg qdiff [OPTION]... [FILE]...')), | |
3044 | "qdelete|qremove|qrm": |
|
3044 | "qdelete|qremove|qrm": | |
3045 | (delete, |
|
3045 | (delete, | |
3046 | [('k', 'keep', None, _('keep patch file')), |
|
3046 | [('k', 'keep', None, _('keep patch file')), | |
3047 | ('r', 'rev', [], |
|
3047 | ('r', 'rev', [], | |
3048 | _('stop managing a revision (DEPRECATED)'), _('REV'))], |
|
3048 | _('stop managing a revision (DEPRECATED)'), _('REV'))], | |
3049 | _('hg qdelete [-k] [PATCH]...')), |
|
3049 | _('hg qdelete [-k] [PATCH]...')), | |
3050 | 'qfold': |
|
3050 | 'qfold': | |
3051 | (fold, |
|
3051 | (fold, | |
3052 | [('e', 'edit', None, _('edit patch header')), |
|
3052 | [('e', 'edit', None, _('edit patch header')), | |
3053 | ('k', 'keep', None, _('keep folded patch files')), |
|
3053 | ('k', 'keep', None, _('keep folded patch files')), | |
3054 | ] + commands.commitopts, |
|
3054 | ] + commands.commitopts, | |
3055 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')), |
|
3055 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')), | |
3056 | 'qgoto': |
|
3056 | 'qgoto': | |
3057 | (goto, |
|
3057 | (goto, | |
3058 | [('f', 'force', None, _('overwrite any local changes'))], |
|
3058 | [('f', 'force', None, _('overwrite any local changes'))], | |
3059 | _('hg qgoto [OPTION]... PATCH')), |
|
3059 | _('hg qgoto [OPTION]... PATCH')), | |
3060 | 'qguard': |
|
3060 | 'qguard': | |
3061 | (guard, |
|
3061 | (guard, | |
3062 | [('l', 'list', None, _('list all patches and guards')), |
|
3062 | [('l', 'list', None, _('list all patches and guards')), | |
3063 | ('n', 'none', None, _('drop all guards'))], |
|
3063 | ('n', 'none', None, _('drop all guards'))], | |
3064 | _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')), |
|
3064 | _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')), | |
3065 | 'qheader': (header, [], _('hg qheader [PATCH]')), |
|
3065 | 'qheader': (header, [], _('hg qheader [PATCH]')), | |
3066 | "qimport": |
|
3066 | "qimport": | |
3067 | (qimport, |
|
3067 | (qimport, | |
3068 | [('e', 'existing', None, _('import file in patch directory')), |
|
3068 | [('e', 'existing', None, _('import file in patch directory')), | |
3069 | ('n', 'name', '', |
|
3069 | ('n', 'name', '', | |
3070 | _('name of patch file'), _('NAME')), |
|
3070 | _('name of patch file'), _('NAME')), | |
3071 | ('f', 'force', None, _('overwrite existing files')), |
|
3071 | ('f', 'force', None, _('overwrite existing files')), | |
3072 | ('r', 'rev', [], |
|
3072 | ('r', 'rev', [], | |
3073 | _('place existing revisions under mq control'), _('REV')), |
|
3073 | _('place existing revisions under mq control'), _('REV')), | |
3074 | ('g', 'git', None, _('use git extended diff format')), |
|
3074 | ('g', 'git', None, _('use git extended diff format')), | |
3075 | ('P', 'push', None, _('qpush after importing'))], |
|
3075 | ('P', 'push', None, _('qpush after importing'))], | |
3076 | _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')), |
|
3076 | _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')), | |
3077 | "^qinit": |
|
3077 | "^qinit": | |
3078 | (init, |
|
3078 | (init, | |
3079 | [('c', 'create-repo', None, _('create queue repository'))], |
|
3079 | [('c', 'create-repo', None, _('create queue repository'))], | |
3080 | _('hg qinit [-c]')), |
|
3080 | _('hg qinit [-c]')), | |
3081 | "^qnew": |
|
3081 | "^qnew": | |
3082 | (new, |
|
3082 | (new, | |
3083 | [('e', 'edit', None, _('edit commit message')), |
|
3083 | [('e', 'edit', None, _('edit commit message')), | |
3084 | ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), |
|
3084 | ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), | |
3085 | ('g', 'git', None, _('use git extended diff format')), |
|
3085 | ('g', 'git', None, _('use git extended diff format')), | |
3086 | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
|
3086 | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), | |
3087 | ('u', 'user', '', |
|
3087 | ('u', 'user', '', | |
3088 | _('add "From: <USER>" to patch'), _('USER')), |
|
3088 | _('add "From: <USER>" to patch'), _('USER')), | |
3089 | ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
|
3089 | ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | |
3090 | ('d', 'date', '', |
|
3090 | ('d', 'date', '', | |
3091 | _('add "Date: <DATE>" to patch'), _('DATE')) |
|
3091 | _('add "Date: <DATE>" to patch'), _('DATE')) | |
3092 | ] + commands.walkopts + commands.commitopts, |
|
3092 | ] + commands.walkopts + commands.commitopts, | |
3093 | _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')), |
|
3093 | _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')), | |
3094 | "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
|
3094 | "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), | |
3095 | "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
|
3095 | "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), | |
3096 | "^qpop": |
|
3096 | "^qpop": | |
3097 | (pop, |
|
3097 | (pop, | |
3098 | [('a', 'all', None, _('pop all patches')), |
|
3098 | [('a', 'all', None, _('pop all patches')), | |
3099 | ('n', 'name', '', |
|
3099 | ('n', 'name', '', | |
3100 | _('queue name to pop (DEPRECATED)'), _('NAME')), |
|
3100 | _('queue name to pop (DEPRECATED)'), _('NAME')), | |
3101 | ('f', 'force', None, _('forget any local changes to patched files'))], |
|
3101 | ('f', 'force', None, _('forget any local changes to patched files'))], | |
3102 | _('hg qpop [-a] [-f] [PATCH | INDEX]')), |
|
3102 | _('hg qpop [-a] [-f] [PATCH | INDEX]')), | |
3103 | "^qpush": |
|
3103 | "^qpush": | |
3104 | (push, |
|
3104 | (push, | |
3105 | [('f', 'force', None, _('apply on top of local changes')), |
|
3105 | [('f', 'force', None, _('apply on top of local changes')), | |
3106 | ('l', 'list', None, _('list patch name in commit text')), |
|
3106 | ('l', 'list', None, _('list patch name in commit text')), | |
3107 | ('a', 'all', None, _('apply all patches')), |
|
3107 | ('a', 'all', None, _('apply all patches')), | |
3108 | ('m', 'merge', None, _('merge from another queue (DEPRECATED)')), |
|
3108 | ('m', 'merge', None, _('merge from another queue (DEPRECATED)')), | |
3109 | ('n', 'name', '', |
|
3109 | ('n', 'name', '', | |
3110 | _('merge queue name (DEPRECATED)'), _('NAME')), |
|
3110 | _('merge queue name (DEPRECATED)'), _('NAME')), | |
3111 | ('', 'move', None, _('reorder patch series and apply only the patch'))], |
|
3111 | ('', 'move', None, _('reorder patch series and apply only the patch'))], | |
3112 | _('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]')), |
|
3112 | _('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]')), | |
3113 | "^qrefresh": |
|
3113 | "^qrefresh": | |
3114 | (refresh, |
|
3114 | (refresh, | |
3115 | [('e', 'edit', None, _('edit commit message')), |
|
3115 | [('e', 'edit', None, _('edit commit message')), | |
3116 | ('g', 'git', None, _('use git extended diff format')), |
|
3116 | ('g', 'git', None, _('use git extended diff format')), | |
3117 | ('s', 'short', None, |
|
3117 | ('s', 'short', None, | |
3118 | _('refresh only files already in the patch and specified files')), |
|
3118 | _('refresh only files already in the patch and specified files')), | |
3119 | ('U', 'currentuser', None, |
|
3119 | ('U', 'currentuser', None, | |
3120 | _('add/update author field in patch with current user')), |
|
3120 | _('add/update author field in patch with current user')), | |
3121 | ('u', 'user', '', |
|
3121 | ('u', 'user', '', | |
3122 | _('add/update author field in patch with given user'), _('USER')), |
|
3122 | _('add/update author field in patch with given user'), _('USER')), | |
3123 | ('D', 'currentdate', None, |
|
3123 | ('D', 'currentdate', None, | |
3124 | _('add/update date field in patch with current date')), |
|
3124 | _('add/update date field in patch with current date')), | |
3125 | ('d', 'date', '', |
|
3125 | ('d', 'date', '', | |
3126 | _('add/update date field in patch with given date'), _('DATE')) |
|
3126 | _('add/update date field in patch with given date'), _('DATE')) | |
3127 | ] + commands.walkopts + commands.commitopts, |
|
3127 | ] + commands.walkopts + commands.commitopts, | |
3128 | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), |
|
3128 | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), | |
3129 | 'qrename|qmv': |
|
3129 | 'qrename|qmv': | |
3130 | (rename, [], _('hg qrename PATCH1 [PATCH2]')), |
|
3130 | (rename, [], _('hg qrename PATCH1 [PATCH2]')), | |
3131 | "qrestore": |
|
3131 | "qrestore": | |
3132 | (restore, |
|
3132 | (restore, | |
3133 | [('d', 'delete', None, _('delete save entry')), |
|
3133 | [('d', 'delete', None, _('delete save entry')), | |
3134 | ('u', 'update', None, _('update queue working directory'))], |
|
3134 | ('u', 'update', None, _('update queue working directory'))], | |
3135 | _('hg qrestore [-d] [-u] REV')), |
|
3135 | _('hg qrestore [-d] [-u] REV')), | |
3136 | "qsave": |
|
3136 | "qsave": | |
3137 | (save, |
|
3137 | (save, | |
3138 | [('c', 'copy', None, _('copy patch directory')), |
|
3138 | [('c', 'copy', None, _('copy patch directory')), | |
3139 | ('n', 'name', '', |
|
3139 | ('n', 'name', '', | |
3140 | _('copy directory name'), _('NAME')), |
|
3140 | _('copy directory name'), _('NAME')), | |
3141 | ('e', 'empty', None, _('clear queue status file')), |
|
3141 | ('e', 'empty', None, _('clear queue status file')), | |
3142 | ('f', 'force', None, _('force copy'))] + commands.commitopts, |
|
3142 | ('f', 'force', None, _('force copy'))] + commands.commitopts, | |
3143 | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')), |
|
3143 | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')), | |
3144 | "qselect": |
|
3144 | "qselect": | |
3145 | (select, |
|
3145 | (select, | |
3146 | [('n', 'none', None, _('disable all guards')), |
|
3146 | [('n', 'none', None, _('disable all guards')), | |
3147 | ('s', 'series', None, _('list all guards in series file')), |
|
3147 | ('s', 'series', None, _('list all guards in series file')), | |
3148 | ('', 'pop', None, _('pop to before first guarded applied patch')), |
|
3148 | ('', 'pop', None, _('pop to before first guarded applied patch')), | |
3149 | ('', 'reapply', None, _('pop, then reapply patches'))], |
|
3149 | ('', 'reapply', None, _('pop, then reapply patches'))], | |
3150 | _('hg qselect [OPTION]... [GUARD]...')), |
|
3150 | _('hg qselect [OPTION]... [GUARD]...')), | |
3151 | "qseries": |
|
3151 | "qseries": | |
3152 | (series, |
|
3152 | (series, | |
3153 | [('m', 'missing', None, _('print patches not in series')), |
|
3153 | [('m', 'missing', None, _('print patches not in series')), | |
3154 | ] + seriesopts, |
|
3154 | ] + seriesopts, | |
3155 | _('hg qseries [-ms]')), |
|
3155 | _('hg qseries [-ms]')), | |
3156 | "strip": |
|
3156 | "strip": | |
3157 | (strip, |
|
3157 | (strip, | |
3158 | [('f', 'force', None, _('force removal of changesets even if the ' |
|
3158 | [('f', 'force', None, _('force removal of changesets even if the ' | |
3159 | 'working directory has uncommitted changes')), |
|
3159 | 'working directory has uncommitted changes')), | |
3160 | ('b', 'backup', None, _('bundle only changesets with local revision' |
|
3160 | ('b', 'backup', None, _('bundle only changesets with local revision' | |
3161 | ' number greater than REV which are not' |
|
3161 | ' number greater than REV which are not' | |
3162 | ' descendants of REV (DEPRECATED)')), |
|
3162 | ' descendants of REV (DEPRECATED)')), | |
3163 | ('n', 'no-backup', None, _('no backups')), |
|
3163 | ('n', 'no-backup', None, _('no backups')), | |
3164 | ('', 'nobackup', None, _('no backups (DEPRECATED)')), |
|
3164 | ('', 'nobackup', None, _('no backups (DEPRECATED)')), | |
3165 | ('k', 'keep', None, _("do not modify working copy during strip"))], |
|
3165 | ('k', 'keep', None, _("do not modify working copy during strip"))], | |
3166 | _('hg strip [-k] [-f] [-n] REV...')), |
|
3166 | _('hg strip [-k] [-f] [-n] REV...')), | |
3167 | "qtop": (top, [] + seriesopts, _('hg qtop [-s]')), |
|
3167 | "qtop": (top, [] + seriesopts, _('hg qtop [-s]')), | |
3168 | "qunapplied": |
|
3168 | "qunapplied": | |
3169 | (unapplied, |
|
3169 | (unapplied, | |
3170 | [('1', 'first', None, _('show only the first patch'))] + seriesopts, |
|
3170 | [('1', 'first', None, _('show only the first patch'))] + seriesopts, | |
3171 | _('hg qunapplied [-1] [-s] [PATCH]')), |
|
3171 | _('hg qunapplied [-1] [-s] [PATCH]')), | |
3172 | "qfinish": |
|
3172 | "qfinish": | |
3173 | (finish, |
|
3173 | (finish, | |
3174 | [('a', 'applied', None, _('finish all applied changesets'))], |
|
3174 | [('a', 'applied', None, _('finish all applied changesets'))], | |
3175 | _('hg qfinish [-a] [REV]...')), |
|
3175 | _('hg qfinish [-a] [REV]...')), | |
3176 | 'qqueue': |
|
3176 | 'qqueue': | |
3177 | (qqueue, |
|
3177 | (qqueue, | |
3178 | [ |
|
3178 | [ | |
3179 | ('l', 'list', False, _('list all available queues')), |
|
3179 | ('l', 'list', False, _('list all available queues')), | |
3180 | ('c', 'create', False, _('create new queue')), |
|
3180 | ('c', 'create', False, _('create new queue')), | |
3181 | ('', 'rename', False, _('rename active queue')), |
|
3181 | ('', 'rename', False, _('rename active queue')), | |
3182 | ('', 'delete', False, _('delete reference to queue')), |
|
3182 | ('', 'delete', False, _('delete reference to queue')), | |
3183 | ('', 'purge', False, _('delete queue, and remove patch dir')), |
|
3183 | ('', 'purge', False, _('delete queue, and remove patch dir')), | |
3184 | ], |
|
3184 | ], | |
3185 | _('[OPTION] [QUEUE]')), |
|
3185 | _('[OPTION] [QUEUE]')), | |
3186 | } |
|
3186 | } | |
3187 |
|
3187 | |||
3188 | colortable = {'qguard.negative': 'red', |
|
3188 | colortable = {'qguard.negative': 'red', | |
3189 | 'qguard.positive': 'yellow', |
|
3189 | 'qguard.positive': 'yellow', | |
3190 | 'qguard.unguarded': 'green', |
|
3190 | 'qguard.unguarded': 'green', | |
3191 | 'qseries.applied': 'blue bold underline', |
|
3191 | 'qseries.applied': 'blue bold underline', | |
3192 | 'qseries.guarded': 'black bold', |
|
3192 | 'qseries.guarded': 'black bold', | |
3193 | 'qseries.missing': 'red bold', |
|
3193 | 'qseries.missing': 'red bold', | |
3194 | 'qseries.unapplied': 'black bold'} |
|
3194 | 'qseries.unapplied': 'black bold'} |
@@ -1,83 +1,96 b'' | |||||
1 |
|
1 | |||
2 | $ echo "[extensions]" >> $HGRCPATH |
|
2 | $ echo "[extensions]" >> $HGRCPATH | |
3 | $ echo "mq=" >> $HGRCPATH |
|
3 | $ echo "mq=" >> $HGRCPATH | |
4 |
|
4 | |||
5 | $ hg init a |
|
5 | $ hg init a | |
6 | $ cd a |
|
6 | $ cd a | |
7 |
|
7 | |||
8 | $ echo 'base' > base |
|
8 | $ echo 'base' > base | |
9 | $ hg ci -Ambase |
|
9 | $ hg ci -Ambase | |
10 | adding base |
|
10 | adding base | |
11 |
|
11 | |||
12 | $ hg qnew -mmqbase mqbase |
|
12 | $ hg qnew -mmqbase mqbase | |
13 |
|
13 | |||
14 | $ hg qrename mqbase renamed |
|
14 | $ hg qrename mqbase renamed | |
15 | $ mkdir .hg/patches/foo |
|
15 | $ mkdir .hg/patches/foo | |
16 | $ hg qrename renamed foo |
|
16 | $ hg qrename renamed foo | |
17 |
|
17 | |||
18 | $ hg qseries |
|
18 | $ hg qseries | |
19 | foo/renamed |
|
19 | foo/renamed | |
20 |
|
20 | |||
21 | $ ls .hg/patches/foo |
|
21 | $ ls .hg/patches/foo | |
22 | renamed |
|
22 | renamed | |
23 |
|
23 | |||
24 | $ mkdir .hg/patches/bar |
|
24 | $ mkdir .hg/patches/bar | |
25 | $ hg qrename foo/renamed bar |
|
25 | $ hg qrename foo/renamed bar | |
26 |
|
26 | |||
27 | $ hg qseries |
|
27 | $ hg qseries | |
28 | bar/renamed |
|
28 | bar/renamed | |
29 |
|
29 | |||
30 | $ ls .hg/patches/bar |
|
30 | $ ls .hg/patches/bar | |
31 | renamed |
|
31 | renamed | |
32 |
|
32 | |||
33 | $ hg qrename bar/renamed baz |
|
33 | $ hg qrename bar/renamed baz | |
34 |
|
34 | |||
35 | $ hg qseries |
|
35 | $ hg qseries | |
36 | baz |
|
36 | baz | |
37 |
|
37 | |||
38 | $ ls .hg/patches/baz |
|
38 | $ ls .hg/patches/baz | |
39 | .hg/patches/baz |
|
39 | .hg/patches/baz | |
40 |
|
40 | |||
41 | $ hg qrename baz new/dir |
|
41 | $ hg qrename baz new/dir | |
42 |
|
42 | |||
43 | $ hg qseries |
|
43 | $ hg qseries | |
44 | new/dir |
|
44 | new/dir | |
45 |
|
45 | |||
46 | $ ls .hg/patches/new/dir |
|
46 | $ ls .hg/patches/new/dir | |
47 | .hg/patches/new/dir |
|
47 | .hg/patches/new/dir | |
48 |
|
48 | |||
49 | $ cd .. |
|
49 | $ cd .. | |
50 |
|
50 | |||
51 | Test patch being renamed before committed: |
|
51 | Test patch being renamed before committed: | |
52 |
|
52 | |||
53 | $ hg init b |
|
53 | $ hg init b | |
54 | $ cd b |
|
54 | $ cd b | |
55 | $ hg qinit -c |
|
55 | $ hg qinit -c | |
56 | $ hg qnew x |
|
56 | $ hg qnew x | |
57 | $ hg qrename y |
|
57 | $ hg qrename y | |
58 | $ hg qcommit -m rename |
|
58 | $ hg qcommit -m rename | |
59 |
|
59 | |||
60 | $ cd .. |
|
60 | $ cd .. | |
61 |
|
61 | |||
62 | Test overlapping renames (issue2388) |
|
62 | Test overlapping renames (issue2388) | |
63 |
|
63 | |||
64 | $ hg init c |
|
64 | $ hg init c | |
65 | $ cd c |
|
65 | $ cd c | |
66 | $ hg qinit -c |
|
66 | $ hg qinit -c | |
67 | $ echo a > a |
|
67 | $ echo a > a | |
68 | $ hg add |
|
68 | $ hg add | |
69 | adding a |
|
69 | adding a | |
70 | $ hg qnew patcha |
|
70 | $ hg qnew patcha | |
71 | $ echo b > b |
|
71 | $ echo b > b | |
72 | $ hg add |
|
72 | $ hg add | |
73 | adding b |
|
73 | adding b | |
74 | $ hg qnew patchb |
|
74 | $ hg qnew patchb | |
75 | $ hg ci --mq -m c1 |
|
75 | $ hg ci --mq -m c1 | |
76 | $ hg qrename patchb patchc |
|
76 | $ hg qrename patchb patchc | |
77 | $ hg qrename patcha patchb |
|
77 | $ hg qrename patcha patchb | |
78 | $ hg st --mq |
|
78 | $ hg st --mq | |
79 | M patchb |
|
79 | M patchb | |
80 | M series |
|
80 | M series | |
81 | A patchc |
|
81 | A patchc | |
82 | R patcha |
|
82 | R patcha | |
83 | $ cd .. |
|
83 | $ cd .. | |
|
84 | ||||
|
85 | Test renames with mq repo (issue2097) | |||
|
86 | ||||
|
87 | $ hg init issue2097 | |||
|
88 | $ cd issue2097 | |||
|
89 | $ hg qnew p0 | |||
|
90 | $ (cd .hg/patches && hg init) | |||
|
91 | $ hg qren p0 p1 | |||
|
92 | $ hg debugstate --mq | |||
|
93 | $ hg ci --mq -mq0 | |||
|
94 | nothing changed | |||
|
95 | [1] | |||
|
96 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now