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