Show More
@@ -1,2193 +1,2191 b'' | |||||
1 | # queue.py - patch queues for mercurial |
|
1 | # queue.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 |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | '''patch management and development |
|
8 | '''patch management and development | |
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 | prepare repository to work with patches qinit |
|
19 | prepare repository to work with patches qinit | |
20 | create new patch qnew |
|
20 | create new patch qnew | |
21 | import existing patch qimport |
|
21 | import existing patch qimport | |
22 |
|
22 | |||
23 | print patch series qseries |
|
23 | print patch series qseries | |
24 | print applied patches qapplied |
|
24 | print applied patches qapplied | |
25 | print name of top applied patch qtop |
|
25 | print name of top applied patch qtop | |
26 |
|
26 | |||
27 | add known patch to applied stack qpush |
|
27 | add known patch to applied stack qpush | |
28 | remove patch from applied stack qpop |
|
28 | remove patch from applied stack qpop | |
29 | refresh contents of top applied patch qrefresh |
|
29 | refresh contents of top applied patch qrefresh | |
30 | ''' |
|
30 | ''' | |
31 |
|
31 | |||
32 | from mercurial.demandload import * |
|
32 | from mercurial.demandload import * | |
33 | from mercurial.i18n import gettext as _ |
|
33 | from mercurial.i18n import gettext as _ | |
34 | from mercurial import commands |
|
34 | from mercurial import commands | |
35 | demandload(globals(), "os sys re struct traceback errno bz2") |
|
35 | demandload(globals(), "os sys re struct traceback errno bz2") | |
36 | demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,util,changegroup") |
|
36 | demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,util,changegroup") | |
37 |
|
37 | |||
38 | commands.norepo += " qclone qversion" |
|
38 | commands.norepo += " qclone qversion" | |
39 |
|
39 | |||
40 | class statusentry: |
|
40 | class statusentry: | |
41 | def __init__(self, rev, name=None): |
|
41 | def __init__(self, rev, name=None): | |
42 | if not name: |
|
42 | if not name: | |
43 | fields = rev.split(':', 1) |
|
43 | fields = rev.split(':', 1) | |
44 | if len(fields) == 2: |
|
44 | if len(fields) == 2: | |
45 | self.rev, self.name = fields |
|
45 | self.rev, self.name = fields | |
46 | else: |
|
46 | else: | |
47 | self.rev, self.name = None, None |
|
47 | self.rev, self.name = None, None | |
48 | else: |
|
48 | else: | |
49 | self.rev, self.name = rev, name |
|
49 | self.rev, self.name = rev, name | |
50 |
|
50 | |||
51 | def __str__(self): |
|
51 | def __str__(self): | |
52 | return self.rev + ':' + self.name |
|
52 | return self.rev + ':' + self.name | |
53 |
|
53 | |||
54 | class queue: |
|
54 | class queue: | |
55 | def __init__(self, ui, path, patchdir=None): |
|
55 | def __init__(self, ui, path, patchdir=None): | |
56 | self.basepath = path |
|
56 | self.basepath = path | |
57 | self.path = patchdir or os.path.join(path, "patches") |
|
57 | self.path = patchdir or os.path.join(path, "patches") | |
58 | self.opener = util.opener(self.path) |
|
58 | self.opener = util.opener(self.path) | |
59 | self.ui = ui |
|
59 | self.ui = ui | |
60 | self.applied = [] |
|
60 | self.applied = [] | |
61 | self.full_series = [] |
|
61 | self.full_series = [] | |
62 | self.applied_dirty = 0 |
|
62 | self.applied_dirty = 0 | |
63 | self.series_dirty = 0 |
|
63 | self.series_dirty = 0 | |
64 | self.series_path = "series" |
|
64 | self.series_path = "series" | |
65 | self.status_path = "status" |
|
65 | self.status_path = "status" | |
66 | self.guards_path = "guards" |
|
66 | self.guards_path = "guards" | |
67 | self.active_guards = None |
|
67 | self.active_guards = None | |
68 | self.guards_dirty = False |
|
68 | self.guards_dirty = False | |
69 | self._diffopts = None |
|
69 | self._diffopts = None | |
70 |
|
70 | |||
71 | if os.path.exists(self.join(self.series_path)): |
|
71 | if os.path.exists(self.join(self.series_path)): | |
72 | self.full_series = self.opener(self.series_path).read().splitlines() |
|
72 | self.full_series = self.opener(self.series_path).read().splitlines() | |
73 | self.parse_series() |
|
73 | self.parse_series() | |
74 |
|
74 | |||
75 | if os.path.exists(self.join(self.status_path)): |
|
75 | if os.path.exists(self.join(self.status_path)): | |
76 | lines = self.opener(self.status_path).read().splitlines() |
|
76 | lines = self.opener(self.status_path).read().splitlines() | |
77 | self.applied = [statusentry(l) for l in lines] |
|
77 | self.applied = [statusentry(l) for l in lines] | |
78 |
|
78 | |||
79 | def diffopts(self): |
|
79 | def diffopts(self): | |
80 | if self._diffopts is None: |
|
80 | if self._diffopts is None: | |
81 | self._diffopts = patch.diffopts(self.ui) |
|
81 | self._diffopts = patch.diffopts(self.ui) | |
82 | return self._diffopts |
|
82 | return self._diffopts | |
83 |
|
83 | |||
84 | def join(self, *p): |
|
84 | def join(self, *p): | |
85 | return os.path.join(self.path, *p) |
|
85 | return os.path.join(self.path, *p) | |
86 |
|
86 | |||
87 | def find_series(self, patch): |
|
87 | def find_series(self, patch): | |
88 | pre = re.compile("(\s*)([^#]+)") |
|
88 | pre = re.compile("(\s*)([^#]+)") | |
89 | index = 0 |
|
89 | index = 0 | |
90 | for l in self.full_series: |
|
90 | for l in self.full_series: | |
91 | m = pre.match(l) |
|
91 | m = pre.match(l) | |
92 | if m: |
|
92 | if m: | |
93 | s = m.group(2) |
|
93 | s = m.group(2) | |
94 | s = s.rstrip() |
|
94 | s = s.rstrip() | |
95 | if s == patch: |
|
95 | if s == patch: | |
96 | return index |
|
96 | return index | |
97 | index += 1 |
|
97 | index += 1 | |
98 | return None |
|
98 | return None | |
99 |
|
99 | |||
100 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
100 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') | |
101 |
|
101 | |||
102 | def parse_series(self): |
|
102 | def parse_series(self): | |
103 | self.series = [] |
|
103 | self.series = [] | |
104 | self.series_guards = [] |
|
104 | self.series_guards = [] | |
105 | for l in self.full_series: |
|
105 | for l in self.full_series: | |
106 | h = l.find('#') |
|
106 | h = l.find('#') | |
107 | if h == -1: |
|
107 | if h == -1: | |
108 | patch = l |
|
108 | patch = l | |
109 | comment = '' |
|
109 | comment = '' | |
110 | elif h == 0: |
|
110 | elif h == 0: | |
111 | continue |
|
111 | continue | |
112 | else: |
|
112 | else: | |
113 | patch = l[:h] |
|
113 | patch = l[:h] | |
114 | comment = l[h:] |
|
114 | comment = l[h:] | |
115 | patch = patch.strip() |
|
115 | patch = patch.strip() | |
116 | if patch: |
|
116 | if patch: | |
117 | if patch in self.series: |
|
117 | if patch in self.series: | |
118 | raise util.Abort(_('%s appears more than once in %s') % |
|
118 | raise util.Abort(_('%s appears more than once in %s') % | |
119 | (patch, self.join(self.series_path))) |
|
119 | (patch, self.join(self.series_path))) | |
120 | self.series.append(patch) |
|
120 | self.series.append(patch) | |
121 | self.series_guards.append(self.guard_re.findall(comment)) |
|
121 | self.series_guards.append(self.guard_re.findall(comment)) | |
122 |
|
122 | |||
123 | def check_guard(self, guard): |
|
123 | def check_guard(self, guard): | |
124 | bad_chars = '# \t\r\n\f' |
|
124 | bad_chars = '# \t\r\n\f' | |
125 | first = guard[0] |
|
125 | first = guard[0] | |
126 | for c in '-+': |
|
126 | for c in '-+': | |
127 | if first == c: |
|
127 | if first == c: | |
128 | return (_('guard %r starts with invalid character: %r') % |
|
128 | return (_('guard %r starts with invalid character: %r') % | |
129 | (guard, c)) |
|
129 | (guard, c)) | |
130 | for c in bad_chars: |
|
130 | for c in bad_chars: | |
131 | if c in guard: |
|
131 | if c in guard: | |
132 | return _('invalid character in guard %r: %r') % (guard, c) |
|
132 | return _('invalid character in guard %r: %r') % (guard, c) | |
133 |
|
133 | |||
134 | def set_active(self, guards): |
|
134 | def set_active(self, guards): | |
135 | for guard in guards: |
|
135 | for guard in guards: | |
136 | bad = self.check_guard(guard) |
|
136 | bad = self.check_guard(guard) | |
137 | if bad: |
|
137 | if bad: | |
138 | raise util.Abort(bad) |
|
138 | raise util.Abort(bad) | |
139 | guards = dict.fromkeys(guards).keys() |
|
139 | guards = dict.fromkeys(guards).keys() | |
140 | guards.sort() |
|
140 | guards.sort() | |
141 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) |
|
141 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) | |
142 | self.active_guards = guards |
|
142 | self.active_guards = guards | |
143 | self.guards_dirty = True |
|
143 | self.guards_dirty = True | |
144 |
|
144 | |||
145 | def active(self): |
|
145 | def active(self): | |
146 | if self.active_guards is None: |
|
146 | if self.active_guards is None: | |
147 | self.active_guards = [] |
|
147 | self.active_guards = [] | |
148 | try: |
|
148 | try: | |
149 | guards = self.opener(self.guards_path).read().split() |
|
149 | guards = self.opener(self.guards_path).read().split() | |
150 | except IOError, err: |
|
150 | except IOError, err: | |
151 | if err.errno != errno.ENOENT: raise |
|
151 | if err.errno != errno.ENOENT: raise | |
152 | guards = [] |
|
152 | guards = [] | |
153 | for i, guard in enumerate(guards): |
|
153 | for i, guard in enumerate(guards): | |
154 | bad = self.check_guard(guard) |
|
154 | bad = self.check_guard(guard) | |
155 | if bad: |
|
155 | if bad: | |
156 | self.ui.warn('%s:%d: %s\n' % |
|
156 | self.ui.warn('%s:%d: %s\n' % | |
157 | (self.join(self.guards_path), i + 1, bad)) |
|
157 | (self.join(self.guards_path), i + 1, bad)) | |
158 | else: |
|
158 | else: | |
159 | self.active_guards.append(guard) |
|
159 | self.active_guards.append(guard) | |
160 | return self.active_guards |
|
160 | return self.active_guards | |
161 |
|
161 | |||
162 | def set_guards(self, idx, guards): |
|
162 | def set_guards(self, idx, guards): | |
163 | for g in guards: |
|
163 | for g in guards: | |
164 | if len(g) < 2: |
|
164 | if len(g) < 2: | |
165 | raise util.Abort(_('guard %r too short') % g) |
|
165 | raise util.Abort(_('guard %r too short') % g) | |
166 | if g[0] not in '-+': |
|
166 | if g[0] not in '-+': | |
167 | raise util.Abort(_('guard %r starts with invalid char') % g) |
|
167 | raise util.Abort(_('guard %r starts with invalid char') % g) | |
168 | bad = self.check_guard(g[1:]) |
|
168 | bad = self.check_guard(g[1:]) | |
169 | if bad: |
|
169 | if bad: | |
170 | raise util.Abort(bad) |
|
170 | raise util.Abort(bad) | |
171 | drop = self.guard_re.sub('', self.full_series[idx]) |
|
171 | drop = self.guard_re.sub('', self.full_series[idx]) | |
172 | self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) |
|
172 | self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) | |
173 | self.parse_series() |
|
173 | self.parse_series() | |
174 | self.series_dirty = True |
|
174 | self.series_dirty = True | |
175 |
|
175 | |||
176 | def pushable(self, idx): |
|
176 | def pushable(self, idx): | |
177 | if isinstance(idx, str): |
|
177 | if isinstance(idx, str): | |
178 | idx = self.series.index(idx) |
|
178 | idx = self.series.index(idx) | |
179 | patchguards = self.series_guards[idx] |
|
179 | patchguards = self.series_guards[idx] | |
180 | if not patchguards: |
|
180 | if not patchguards: | |
181 | return True, None |
|
181 | return True, None | |
182 | default = False |
|
182 | default = False | |
183 | guards = self.active() |
|
183 | guards = self.active() | |
184 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] |
|
184 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] | |
185 | if exactneg: |
|
185 | if exactneg: | |
186 | return False, exactneg[0] |
|
186 | return False, exactneg[0] | |
187 | pos = [g for g in patchguards if g[0] == '+'] |
|
187 | pos = [g for g in patchguards if g[0] == '+'] | |
188 | exactpos = [g for g in pos if g[1:] in guards] |
|
188 | exactpos = [g for g in pos if g[1:] in guards] | |
189 | if pos: |
|
189 | if pos: | |
190 | if exactpos: |
|
190 | if exactpos: | |
191 | return True, exactpos[0] |
|
191 | return True, exactpos[0] | |
192 | return False, pos |
|
192 | return False, pos | |
193 | return True, '' |
|
193 | return True, '' | |
194 |
|
194 | |||
195 | def explain_pushable(self, idx, all_patches=False): |
|
195 | def explain_pushable(self, idx, all_patches=False): | |
196 | write = all_patches and self.ui.write or self.ui.warn |
|
196 | write = all_patches and self.ui.write or self.ui.warn | |
197 | if all_patches or self.ui.verbose: |
|
197 | if all_patches or self.ui.verbose: | |
198 | if isinstance(idx, str): |
|
198 | if isinstance(idx, str): | |
199 | idx = self.series.index(idx) |
|
199 | idx = self.series.index(idx) | |
200 | pushable, why = self.pushable(idx) |
|
200 | pushable, why = self.pushable(idx) | |
201 | if all_patches and pushable: |
|
201 | if all_patches and pushable: | |
202 | if why is None: |
|
202 | if why is None: | |
203 | write(_('allowing %s - no guards in effect\n') % |
|
203 | write(_('allowing %s - no guards in effect\n') % | |
204 | self.series[idx]) |
|
204 | self.series[idx]) | |
205 | else: |
|
205 | else: | |
206 | if not why: |
|
206 | if not why: | |
207 | write(_('allowing %s - no matching negative guards\n') % |
|
207 | write(_('allowing %s - no matching negative guards\n') % | |
208 | self.series[idx]) |
|
208 | self.series[idx]) | |
209 | else: |
|
209 | else: | |
210 | write(_('allowing %s - guarded by %r\n') % |
|
210 | write(_('allowing %s - guarded by %r\n') % | |
211 | (self.series[idx], why)) |
|
211 | (self.series[idx], why)) | |
212 | if not pushable: |
|
212 | if not pushable: | |
213 | if why: |
|
213 | if why: | |
214 | write(_('skipping %s - guarded by %r\n') % |
|
214 | write(_('skipping %s - guarded by %r\n') % | |
215 | (self.series[idx], why)) |
|
215 | (self.series[idx], why)) | |
216 | else: |
|
216 | else: | |
217 | write(_('skipping %s - no matching guards\n') % |
|
217 | write(_('skipping %s - no matching guards\n') % | |
218 | self.series[idx]) |
|
218 | self.series[idx]) | |
219 |
|
219 | |||
220 | def save_dirty(self): |
|
220 | def save_dirty(self): | |
221 | def write_list(items, path): |
|
221 | def write_list(items, path): | |
222 | fp = self.opener(path, 'w') |
|
222 | fp = self.opener(path, 'w') | |
223 | for i in items: |
|
223 | for i in items: | |
224 | print >> fp, i |
|
224 | print >> fp, i | |
225 | fp.close() |
|
225 | fp.close() | |
226 | if self.applied_dirty: write_list(map(str, self.applied), self.status_path) |
|
226 | if self.applied_dirty: write_list(map(str, self.applied), self.status_path) | |
227 | if self.series_dirty: write_list(self.full_series, self.series_path) |
|
227 | if self.series_dirty: write_list(self.full_series, self.series_path) | |
228 | if self.guards_dirty: write_list(self.active_guards, self.guards_path) |
|
228 | if self.guards_dirty: write_list(self.active_guards, self.guards_path) | |
229 |
|
229 | |||
230 | def readheaders(self, patch): |
|
230 | def readheaders(self, patch): | |
231 | def eatdiff(lines): |
|
231 | def eatdiff(lines): | |
232 | while lines: |
|
232 | while lines: | |
233 | l = lines[-1] |
|
233 | l = lines[-1] | |
234 | if (l.startswith("diff -") or |
|
234 | if (l.startswith("diff -") or | |
235 | l.startswith("Index:") or |
|
235 | l.startswith("Index:") or | |
236 | l.startswith("===========")): |
|
236 | l.startswith("===========")): | |
237 | del lines[-1] |
|
237 | del lines[-1] | |
238 | else: |
|
238 | else: | |
239 | break |
|
239 | break | |
240 | def eatempty(lines): |
|
240 | def eatempty(lines): | |
241 | while lines: |
|
241 | while lines: | |
242 | l = lines[-1] |
|
242 | l = lines[-1] | |
243 | if re.match('\s*$', l): |
|
243 | if re.match('\s*$', l): | |
244 | del lines[-1] |
|
244 | del lines[-1] | |
245 | else: |
|
245 | else: | |
246 | break |
|
246 | break | |
247 |
|
247 | |||
248 | pf = self.join(patch) |
|
248 | pf = self.join(patch) | |
249 | message = [] |
|
249 | message = [] | |
250 | comments = [] |
|
250 | comments = [] | |
251 | user = None |
|
251 | user = None | |
252 | date = None |
|
252 | date = None | |
253 | format = None |
|
253 | format = None | |
254 | subject = None |
|
254 | subject = None | |
255 | diffstart = 0 |
|
255 | diffstart = 0 | |
256 |
|
256 | |||
257 | for line in file(pf): |
|
257 | for line in file(pf): | |
258 | line = line.rstrip() |
|
258 | line = line.rstrip() | |
259 | if line.startswith('diff --git'): |
|
259 | if line.startswith('diff --git'): | |
260 | diffstart = 2 |
|
260 | diffstart = 2 | |
261 | break |
|
261 | break | |
262 | if diffstart: |
|
262 | if diffstart: | |
263 | if line.startswith('+++ '): |
|
263 | if line.startswith('+++ '): | |
264 | diffstart = 2 |
|
264 | diffstart = 2 | |
265 | break |
|
265 | break | |
266 | if line.startswith("--- "): |
|
266 | if line.startswith("--- "): | |
267 | diffstart = 1 |
|
267 | diffstart = 1 | |
268 | continue |
|
268 | continue | |
269 | elif format == "hgpatch": |
|
269 | elif format == "hgpatch": | |
270 | # parse values when importing the result of an hg export |
|
270 | # parse values when importing the result of an hg export | |
271 | if line.startswith("# User "): |
|
271 | if line.startswith("# User "): | |
272 | user = line[7:] |
|
272 | user = line[7:] | |
273 | elif line.startswith("# Date "): |
|
273 | elif line.startswith("# Date "): | |
274 | date = line[7:] |
|
274 | date = line[7:] | |
275 | elif not line.startswith("# ") and line: |
|
275 | elif not line.startswith("# ") and line: | |
276 | message.append(line) |
|
276 | message.append(line) | |
277 | format = None |
|
277 | format = None | |
278 | elif line == '# HG changeset patch': |
|
278 | elif line == '# HG changeset patch': | |
279 | format = "hgpatch" |
|
279 | format = "hgpatch" | |
280 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
280 | elif (format != "tagdone" and (line.startswith("Subject: ") or | |
281 | line.startswith("subject: "))): |
|
281 | line.startswith("subject: "))): | |
282 | subject = line[9:] |
|
282 | subject = line[9:] | |
283 | format = "tag" |
|
283 | format = "tag" | |
284 | elif (format != "tagdone" and (line.startswith("From: ") or |
|
284 | elif (format != "tagdone" and (line.startswith("From: ") or | |
285 | line.startswith("from: "))): |
|
285 | line.startswith("from: "))): | |
286 | user = line[6:] |
|
286 | user = line[6:] | |
287 | format = "tag" |
|
287 | format = "tag" | |
288 | elif format == "tag" and line == "": |
|
288 | elif format == "tag" and line == "": | |
289 | # when looking for tags (subject: from: etc) they |
|
289 | # when looking for tags (subject: from: etc) they | |
290 | # end once you find a blank line in the source |
|
290 | # end once you find a blank line in the source | |
291 | format = "tagdone" |
|
291 | format = "tagdone" | |
292 | elif message or line: |
|
292 | elif message or line: | |
293 | message.append(line) |
|
293 | message.append(line) | |
294 | comments.append(line) |
|
294 | comments.append(line) | |
295 |
|
295 | |||
296 | eatdiff(message) |
|
296 | eatdiff(message) | |
297 | eatdiff(comments) |
|
297 | eatdiff(comments) | |
298 | eatempty(message) |
|
298 | eatempty(message) | |
299 | eatempty(comments) |
|
299 | eatempty(comments) | |
300 |
|
300 | |||
301 | # make sure message isn't empty |
|
301 | # make sure message isn't empty | |
302 | if format and format.startswith("tag") and subject: |
|
302 | if format and format.startswith("tag") and subject: | |
303 | message.insert(0, "") |
|
303 | message.insert(0, "") | |
304 | message.insert(0, subject) |
|
304 | message.insert(0, subject) | |
305 | return (message, comments, user, date, diffstart > 1) |
|
305 | return (message, comments, user, date, diffstart > 1) | |
306 |
|
306 | |||
307 | def printdiff(self, repo, node1, node2=None, files=None, |
|
307 | def printdiff(self, repo, node1, node2=None, files=None, | |
308 | fp=None, changes=None, opts={}): |
|
308 | fp=None, changes=None, opts={}): | |
309 | fns, matchfn, anypats = cmdutil.matchpats(repo, files, opts) |
|
309 | fns, matchfn, anypats = cmdutil.matchpats(repo, files, opts) | |
310 |
|
310 | |||
311 | patch.diff(repo, node1, node2, fns, match=matchfn, |
|
311 | patch.diff(repo, node1, node2, fns, match=matchfn, | |
312 | fp=fp, changes=changes, opts=self.diffopts()) |
|
312 | fp=fp, changes=changes, opts=self.diffopts()) | |
313 |
|
313 | |||
314 | def mergeone(self, repo, mergeq, head, patch, rev, wlock): |
|
314 | def mergeone(self, repo, mergeq, head, patch, rev, wlock): | |
315 | # first try just applying the patch |
|
315 | # first try just applying the patch | |
316 | (err, n) = self.apply(repo, [ patch ], update_status=False, |
|
316 | (err, n) = self.apply(repo, [ patch ], update_status=False, | |
317 | strict=True, merge=rev, wlock=wlock) |
|
317 | strict=True, merge=rev, wlock=wlock) | |
318 |
|
318 | |||
319 | if err == 0: |
|
319 | if err == 0: | |
320 | return (err, n) |
|
320 | return (err, n) | |
321 |
|
321 | |||
322 | if n is None: |
|
322 | if n is None: | |
323 | raise util.Abort(_("apply failed for patch %s") % patch) |
|
323 | raise util.Abort(_("apply failed for patch %s") % patch) | |
324 |
|
324 | |||
325 | self.ui.warn("patch didn't work out, merging %s\n" % patch) |
|
325 | self.ui.warn("patch didn't work out, merging %s\n" % patch) | |
326 |
|
326 | |||
327 | # apply failed, strip away that rev and merge. |
|
327 | # apply failed, strip away that rev and merge. | |
328 | hg.clean(repo, head, wlock=wlock) |
|
328 | hg.clean(repo, head, wlock=wlock) | |
329 | self.strip(repo, n, update=False, backup='strip', wlock=wlock) |
|
329 | self.strip(repo, n, update=False, backup='strip', wlock=wlock) | |
330 |
|
330 | |||
331 | c = repo.changelog.read(rev) |
|
331 | c = repo.changelog.read(rev) | |
332 | ret = hg.merge(repo, rev, wlock=wlock) |
|
332 | ret = hg.merge(repo, rev, wlock=wlock) | |
333 | if ret: |
|
333 | if ret: | |
334 | raise util.Abort(_("update returned %d") % ret) |
|
334 | raise util.Abort(_("update returned %d") % ret) | |
335 | n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) |
|
335 | n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) | |
336 | if n == None: |
|
336 | if n == None: | |
337 | raise util.Abort(_("repo commit failed")) |
|
337 | raise util.Abort(_("repo commit failed")) | |
338 | try: |
|
338 | try: | |
339 | message, comments, user, date, patchfound = mergeq.readheaders(patch) |
|
339 | message, comments, user, date, patchfound = mergeq.readheaders(patch) | |
340 | except: |
|
340 | except: | |
341 | raise util.Abort(_("unable to read %s") % patch) |
|
341 | raise util.Abort(_("unable to read %s") % patch) | |
342 |
|
342 | |||
343 | patchf = self.opener(patch, "w") |
|
343 | patchf = self.opener(patch, "w") | |
344 | if comments: |
|
344 | if comments: | |
345 | comments = "\n".join(comments) + '\n\n' |
|
345 | comments = "\n".join(comments) + '\n\n' | |
346 | patchf.write(comments) |
|
346 | patchf.write(comments) | |
347 | self.printdiff(repo, head, n, fp=patchf) |
|
347 | self.printdiff(repo, head, n, fp=patchf) | |
348 | patchf.close() |
|
348 | patchf.close() | |
349 | return (0, n) |
|
349 | return (0, n) | |
350 |
|
350 | |||
351 | def qparents(self, repo, rev=None): |
|
351 | def qparents(self, repo, rev=None): | |
352 | if rev is None: |
|
352 | if rev is None: | |
353 | (p1, p2) = repo.dirstate.parents() |
|
353 | (p1, p2) = repo.dirstate.parents() | |
354 | if p2 == revlog.nullid: |
|
354 | if p2 == revlog.nullid: | |
355 | return p1 |
|
355 | return p1 | |
356 | if len(self.applied) == 0: |
|
356 | if len(self.applied) == 0: | |
357 | return None |
|
357 | return None | |
358 | return revlog.bin(self.applied[-1].rev) |
|
358 | return revlog.bin(self.applied[-1].rev) | |
359 | pp = repo.changelog.parents(rev) |
|
359 | pp = repo.changelog.parents(rev) | |
360 | if pp[1] != revlog.nullid: |
|
360 | if pp[1] != revlog.nullid: | |
361 | arevs = [ x.rev for x in self.applied ] |
|
361 | arevs = [ x.rev for x in self.applied ] | |
362 | p0 = revlog.hex(pp[0]) |
|
362 | p0 = revlog.hex(pp[0]) | |
363 | p1 = revlog.hex(pp[1]) |
|
363 | p1 = revlog.hex(pp[1]) | |
364 | if p0 in arevs: |
|
364 | if p0 in arevs: | |
365 | return pp[0] |
|
365 | return pp[0] | |
366 | if p1 in arevs: |
|
366 | if p1 in arevs: | |
367 | return pp[1] |
|
367 | return pp[1] | |
368 | return pp[0] |
|
368 | return pp[0] | |
369 |
|
369 | |||
370 | def mergepatch(self, repo, mergeq, series, wlock): |
|
370 | def mergepatch(self, repo, mergeq, series, wlock): | |
371 | if len(self.applied) == 0: |
|
371 | if len(self.applied) == 0: | |
372 | # each of the patches merged in will have two parents. This |
|
372 | # each of the patches merged in will have two parents. This | |
373 | # can confuse the qrefresh, qdiff, and strip code because it |
|
373 | # can confuse the qrefresh, qdiff, and strip code because it | |
374 | # needs to know which parent is actually in the patch queue. |
|
374 | # needs to know which parent is actually in the patch queue. | |
375 | # so, we insert a merge marker with only one parent. This way |
|
375 | # so, we insert a merge marker with only one parent. This way | |
376 | # the first patch in the queue is never a merge patch |
|
376 | # the first patch in the queue is never a merge patch | |
377 | # |
|
377 | # | |
378 | pname = ".hg.patches.merge.marker" |
|
378 | pname = ".hg.patches.merge.marker" | |
379 | n = repo.commit(None, '[mq]: merge marker', user=None, force=1, |
|
379 | n = repo.commit(None, '[mq]: merge marker', user=None, force=1, | |
380 | wlock=wlock) |
|
380 | wlock=wlock) | |
381 | self.applied.append(statusentry(revlog.hex(n), pname)) |
|
381 | self.applied.append(statusentry(revlog.hex(n), pname)) | |
382 | self.applied_dirty = 1 |
|
382 | self.applied_dirty = 1 | |
383 |
|
383 | |||
384 | head = self.qparents(repo) |
|
384 | head = self.qparents(repo) | |
385 |
|
385 | |||
386 | for patch in series: |
|
386 | for patch in series: | |
387 | patch = mergeq.lookup(patch, strict=True) |
|
387 | patch = mergeq.lookup(patch, strict=True) | |
388 | if not patch: |
|
388 | if not patch: | |
389 | self.ui.warn("patch %s does not exist\n" % patch) |
|
389 | self.ui.warn("patch %s does not exist\n" % patch) | |
390 | return (1, None) |
|
390 | return (1, None) | |
391 | pushable, reason = self.pushable(patch) |
|
391 | pushable, reason = self.pushable(patch) | |
392 | if not pushable: |
|
392 | if not pushable: | |
393 | self.explain_pushable(patch, all_patches=True) |
|
393 | self.explain_pushable(patch, all_patches=True) | |
394 | continue |
|
394 | continue | |
395 | info = mergeq.isapplied(patch) |
|
395 | info = mergeq.isapplied(patch) | |
396 | if not info: |
|
396 | if not info: | |
397 | self.ui.warn("patch %s is not applied\n" % patch) |
|
397 | self.ui.warn("patch %s is not applied\n" % patch) | |
398 | return (1, None) |
|
398 | return (1, None) | |
399 | rev = revlog.bin(info[1]) |
|
399 | rev = revlog.bin(info[1]) | |
400 | (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) |
|
400 | (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) | |
401 | if head: |
|
401 | if head: | |
402 | self.applied.append(statusentry(revlog.hex(head), patch)) |
|
402 | self.applied.append(statusentry(revlog.hex(head), patch)) | |
403 | self.applied_dirty = 1 |
|
403 | self.applied_dirty = 1 | |
404 | if err: |
|
404 | if err: | |
405 | return (err, head) |
|
405 | return (err, head) | |
406 | return (0, head) |
|
406 | return (0, head) | |
407 |
|
407 | |||
408 | def patch(self, repo, patchfile): |
|
408 | def patch(self, repo, patchfile): | |
409 | '''Apply patchfile to the working directory. |
|
409 | '''Apply patchfile to the working directory. | |
410 | patchfile: file name of patch''' |
|
410 | patchfile: file name of patch''' | |
411 | files = {} |
|
411 | files = {} | |
412 | try: |
|
412 | try: | |
413 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
|
413 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, | |
414 | files=files) |
|
414 | files=files) | |
415 | except Exception, inst: |
|
415 | except Exception, inst: | |
416 | self.ui.note(str(inst) + '\n') |
|
416 | self.ui.note(str(inst) + '\n') | |
417 | if not self.ui.verbose: |
|
417 | if not self.ui.verbose: | |
418 | self.ui.warn("patch failed, unable to continue (try -v)\n") |
|
418 | self.ui.warn("patch failed, unable to continue (try -v)\n") | |
419 | return (False, files, False) |
|
419 | return (False, files, False) | |
420 |
|
420 | |||
421 | return (True, files, fuzz) |
|
421 | return (True, files, fuzz) | |
422 |
|
422 | |||
423 | def apply(self, repo, series, list=False, update_status=True, |
|
423 | def apply(self, repo, series, list=False, update_status=True, | |
424 | strict=False, patchdir=None, merge=None, wlock=None): |
|
424 | strict=False, patchdir=None, merge=None, wlock=None): | |
425 | # TODO unify with commands.py |
|
425 | # TODO unify with commands.py | |
426 | if not patchdir: |
|
426 | if not patchdir: | |
427 | patchdir = self.path |
|
427 | patchdir = self.path | |
428 | err = 0 |
|
428 | err = 0 | |
429 | if not wlock: |
|
429 | if not wlock: | |
430 | wlock = repo.wlock() |
|
430 | wlock = repo.wlock() | |
431 | lock = repo.lock() |
|
431 | lock = repo.lock() | |
432 | tr = repo.transaction() |
|
432 | tr = repo.transaction() | |
433 | n = None |
|
433 | n = None | |
434 | for patchname in series: |
|
434 | for patchname in series: | |
435 | pushable, reason = self.pushable(patchname) |
|
435 | pushable, reason = self.pushable(patchname) | |
436 | if not pushable: |
|
436 | if not pushable: | |
437 | self.explain_pushable(patchname, all_patches=True) |
|
437 | self.explain_pushable(patchname, all_patches=True) | |
438 | continue |
|
438 | continue | |
439 | self.ui.warn("applying %s\n" % patchname) |
|
439 | self.ui.warn("applying %s\n" % patchname) | |
440 | pf = os.path.join(patchdir, patchname) |
|
440 | pf = os.path.join(patchdir, patchname) | |
441 |
|
441 | |||
442 | try: |
|
442 | try: | |
443 | message, comments, user, date, patchfound = self.readheaders(patchname) |
|
443 | message, comments, user, date, patchfound = self.readheaders(patchname) | |
444 | except: |
|
444 | except: | |
445 | self.ui.warn("Unable to read %s\n" % patchname) |
|
445 | self.ui.warn("Unable to read %s\n" % patchname) | |
446 | err = 1 |
|
446 | err = 1 | |
447 | break |
|
447 | break | |
448 |
|
448 | |||
449 | if not message: |
|
449 | if not message: | |
450 | message = "imported patch %s\n" % patchname |
|
450 | message = "imported patch %s\n" % patchname | |
451 | else: |
|
451 | else: | |
452 | if list: |
|
452 | if list: | |
453 | message.append("\nimported patch %s" % patchname) |
|
453 | message.append("\nimported patch %s" % patchname) | |
454 | message = '\n'.join(message) |
|
454 | message = '\n'.join(message) | |
455 |
|
455 | |||
456 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
456 | (patcherr, files, fuzz) = self.patch(repo, pf) | |
457 | patcherr = not patcherr |
|
457 | patcherr = not patcherr | |
458 |
|
458 | |||
459 | if merge and files: |
|
459 | if merge and files: | |
460 | # Mark as merged and update dirstate parent info |
|
460 | # Mark as merged and update dirstate parent info | |
461 | repo.dirstate.update(repo.dirstate.filterfiles(files.keys()), 'm') |
|
461 | repo.dirstate.update(repo.dirstate.filterfiles(files.keys()), 'm') | |
462 | p1, p2 = repo.dirstate.parents() |
|
462 | p1, p2 = repo.dirstate.parents() | |
463 | repo.dirstate.setparents(p1, merge) |
|
463 | repo.dirstate.setparents(p1, merge) | |
464 | files = patch.updatedir(self.ui, repo, files, wlock=wlock) |
|
464 | files = patch.updatedir(self.ui, repo, files, wlock=wlock) | |
465 | n = repo.commit(files, message, user, date, force=1, lock=lock, |
|
465 | n = repo.commit(files, message, user, date, force=1, lock=lock, | |
466 | wlock=wlock) |
|
466 | wlock=wlock) | |
467 |
|
467 | |||
468 | if n == None: |
|
468 | if n == None: | |
469 | raise util.Abort(_("repo commit failed")) |
|
469 | raise util.Abort(_("repo commit failed")) | |
470 |
|
470 | |||
471 | if update_status: |
|
471 | if update_status: | |
472 | self.applied.append(statusentry(revlog.hex(n), patchname)) |
|
472 | self.applied.append(statusentry(revlog.hex(n), patchname)) | |
473 |
|
473 | |||
474 | if patcherr: |
|
474 | if patcherr: | |
475 | if not patchfound: |
|
475 | if not patchfound: | |
476 | self.ui.warn("patch %s is empty\n" % patchname) |
|
476 | self.ui.warn("patch %s is empty\n" % patchname) | |
477 | err = 0 |
|
477 | err = 0 | |
478 | else: |
|
478 | else: | |
479 | self.ui.warn("patch failed, rejects left in working dir\n") |
|
479 | self.ui.warn("patch failed, rejects left in working dir\n") | |
480 | err = 1 |
|
480 | err = 1 | |
481 | break |
|
481 | break | |
482 |
|
482 | |||
483 | if fuzz and strict: |
|
483 | if fuzz and strict: | |
484 | self.ui.warn("fuzz found when applying patch, stopping\n") |
|
484 | self.ui.warn("fuzz found when applying patch, stopping\n") | |
485 | err = 1 |
|
485 | err = 1 | |
486 | break |
|
486 | break | |
487 | tr.close() |
|
487 | tr.close() | |
488 | return (err, n) |
|
488 | return (err, n) | |
489 |
|
489 | |||
490 | def delete(self, repo, patches, opts): |
|
490 | def delete(self, repo, patches, opts): | |
491 | realpatches = [] |
|
491 | realpatches = [] | |
492 | for patch in patches: |
|
492 | for patch in patches: | |
493 | patch = self.lookup(patch, strict=True) |
|
493 | patch = self.lookup(patch, strict=True) | |
494 | info = self.isapplied(patch) |
|
494 | info = self.isapplied(patch) | |
495 | if info: |
|
495 | if info: | |
496 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
496 | raise util.Abort(_("cannot delete applied patch %s") % patch) | |
497 | if patch not in self.series: |
|
497 | if patch not in self.series: | |
498 | raise util.Abort(_("patch %s not in series file") % patch) |
|
498 | raise util.Abort(_("patch %s not in series file") % patch) | |
499 | realpatches.append(patch) |
|
499 | realpatches.append(patch) | |
500 |
|
500 | |||
501 | appliedbase = 0 |
|
501 | appliedbase = 0 | |
502 | if opts.get('rev'): |
|
502 | if opts.get('rev'): | |
503 | if not self.applied: |
|
503 | if not self.applied: | |
504 | raise util.Abort(_('no patches applied')) |
|
504 | raise util.Abort(_('no patches applied')) | |
505 | revs = cmdutil.revrange(repo, opts['rev']) |
|
505 | revs = cmdutil.revrange(repo, opts['rev']) | |
506 | if len(revs) > 1 and revs[0] > revs[1]: |
|
506 | if len(revs) > 1 and revs[0] > revs[1]: | |
507 | revs.reverse() |
|
507 | revs.reverse() | |
508 | for rev in revs: |
|
508 | for rev in revs: | |
509 | if appliedbase >= len(self.applied): |
|
509 | if appliedbase >= len(self.applied): | |
510 | raise util.Abort(_("revision %d is not managed") % rev) |
|
510 | raise util.Abort(_("revision %d is not managed") % rev) | |
511 |
|
511 | |||
512 | base = revlog.bin(self.applied[appliedbase].rev) |
|
512 | base = revlog.bin(self.applied[appliedbase].rev) | |
513 | node = repo.changelog.node(rev) |
|
513 | node = repo.changelog.node(rev) | |
514 | if node != base: |
|
514 | if node != base: | |
515 | raise util.Abort(_("cannot delete revision %d above " |
|
515 | raise util.Abort(_("cannot delete revision %d above " | |
516 | "applied patches") % rev) |
|
516 | "applied patches") % rev) | |
517 | realpatches.append(self.applied[appliedbase].name) |
|
517 | realpatches.append(self.applied[appliedbase].name) | |
518 | appliedbase += 1 |
|
518 | appliedbase += 1 | |
519 |
|
519 | |||
520 | if not opts.get('keep'): |
|
520 | if not opts.get('keep'): | |
521 | r = self.qrepo() |
|
521 | r = self.qrepo() | |
522 | if r: |
|
522 | if r: | |
523 | r.remove(realpatches, True) |
|
523 | r.remove(realpatches, True) | |
524 | else: |
|
524 | else: | |
525 | for p in realpatches: |
|
525 | for p in realpatches: | |
526 | os.unlink(self.join(p)) |
|
526 | os.unlink(self.join(p)) | |
527 |
|
527 | |||
528 | if appliedbase: |
|
528 | if appliedbase: | |
529 | del self.applied[:appliedbase] |
|
529 | del self.applied[:appliedbase] | |
530 | self.applied_dirty = 1 |
|
530 | self.applied_dirty = 1 | |
531 | indices = [self.find_series(p) for p in realpatches] |
|
531 | indices = [self.find_series(p) for p in realpatches] | |
532 | indices.sort() |
|
532 | indices.sort() | |
533 | for i in indices[-1::-1]: |
|
533 | for i in indices[-1::-1]: | |
534 | del self.full_series[i] |
|
534 | del self.full_series[i] | |
535 | self.parse_series() |
|
535 | self.parse_series() | |
536 | self.series_dirty = 1 |
|
536 | self.series_dirty = 1 | |
537 |
|
537 | |||
538 | def check_toppatch(self, repo): |
|
538 | def check_toppatch(self, repo): | |
539 | if len(self.applied) > 0: |
|
539 | if len(self.applied) > 0: | |
540 | top = revlog.bin(self.applied[-1].rev) |
|
540 | top = revlog.bin(self.applied[-1].rev) | |
541 | pp = repo.dirstate.parents() |
|
541 | pp = repo.dirstate.parents() | |
542 | if top not in pp: |
|
542 | if top not in pp: | |
543 | raise util.Abort(_("queue top not at same revision as working directory")) |
|
543 | raise util.Abort(_("queue top not at same revision as working directory")) | |
544 | return top |
|
544 | return top | |
545 | return None |
|
545 | return None | |
546 | def check_localchanges(self, repo, force=False, refresh=True): |
|
546 | def check_localchanges(self, repo, force=False, refresh=True): | |
547 | m, a, r, d = repo.status()[:4] |
|
547 | m, a, r, d = repo.status()[:4] | |
548 | if m or a or r or d: |
|
548 | if m or a or r or d: | |
549 | if not force: |
|
549 | if not force: | |
550 | if refresh: |
|
550 | if refresh: | |
551 | raise util.Abort(_("local changes found, refresh first")) |
|
551 | raise util.Abort(_("local changes found, refresh first")) | |
552 | else: |
|
552 | else: | |
553 | raise util.Abort(_("local changes found")) |
|
553 | raise util.Abort(_("local changes found")) | |
554 | return m, a, r, d |
|
554 | return m, a, r, d | |
555 | def new(self, repo, patch, msg=None, force=None): |
|
555 | def new(self, repo, patch, msg=None, force=None): | |
556 | if os.path.exists(self.join(patch)): |
|
556 | if os.path.exists(self.join(patch)): | |
557 | raise util.Abort(_('patch "%s" already exists') % patch) |
|
557 | raise util.Abort(_('patch "%s" already exists') % patch) | |
558 | m, a, r, d = self.check_localchanges(repo, force) |
|
558 | m, a, r, d = self.check_localchanges(repo, force) | |
559 | commitfiles = m + a + r |
|
559 | commitfiles = m + a + r | |
560 | self.check_toppatch(repo) |
|
560 | self.check_toppatch(repo) | |
561 | wlock = repo.wlock() |
|
561 | wlock = repo.wlock() | |
562 | insert = self.full_series_end() |
|
562 | insert = self.full_series_end() | |
563 | if msg: |
|
563 | if msg: | |
564 | n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, |
|
564 | n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, | |
565 | wlock=wlock) |
|
565 | wlock=wlock) | |
566 | else: |
|
566 | else: | |
567 | n = repo.commit(commitfiles, |
|
567 | n = repo.commit(commitfiles, | |
568 | "New patch: %s" % patch, force=True, wlock=wlock) |
|
568 | "New patch: %s" % patch, force=True, wlock=wlock) | |
569 | if n == None: |
|
569 | if n == None: | |
570 | raise util.Abort(_("repo commit failed")) |
|
570 | raise util.Abort(_("repo commit failed")) | |
571 | self.full_series[insert:insert] = [patch] |
|
571 | self.full_series[insert:insert] = [patch] | |
572 | self.applied.append(statusentry(revlog.hex(n), patch)) |
|
572 | self.applied.append(statusentry(revlog.hex(n), patch)) | |
573 | self.parse_series() |
|
573 | self.parse_series() | |
574 | self.series_dirty = 1 |
|
574 | self.series_dirty = 1 | |
575 | self.applied_dirty = 1 |
|
575 | self.applied_dirty = 1 | |
576 | p = self.opener(patch, "w") |
|
576 | p = self.opener(patch, "w") | |
577 | if msg: |
|
577 | if msg: | |
578 | msg = msg + "\n" |
|
578 | msg = msg + "\n" | |
579 | p.write(msg) |
|
579 | p.write(msg) | |
580 | p.close() |
|
580 | p.close() | |
581 | wlock = None |
|
581 | wlock = None | |
582 | r = self.qrepo() |
|
582 | r = self.qrepo() | |
583 | if r: r.add([patch]) |
|
583 | if r: r.add([patch]) | |
584 | if commitfiles: |
|
584 | if commitfiles: | |
585 | self.refresh(repo, short=True) |
|
585 | self.refresh(repo, short=True) | |
586 |
|
586 | |||
587 | def strip(self, repo, rev, update=True, backup="all", wlock=None): |
|
587 | def strip(self, repo, rev, update=True, backup="all", wlock=None): | |
588 | def limitheads(chlog, stop): |
|
588 | def limitheads(chlog, stop): | |
589 | """return the list of all nodes that have no children""" |
|
589 | """return the list of all nodes that have no children""" | |
590 | p = {} |
|
590 | p = {} | |
591 | h = [] |
|
591 | h = [] | |
592 | stoprev = 0 |
|
592 | stoprev = 0 | |
593 | if stop in chlog.nodemap: |
|
593 | if stop in chlog.nodemap: | |
594 | stoprev = chlog.rev(stop) |
|
594 | stoprev = chlog.rev(stop) | |
595 |
|
595 | |||
596 | for r in xrange(chlog.count() - 1, -1, -1): |
|
596 | for r in xrange(chlog.count() - 1, -1, -1): | |
597 | n = chlog.node(r) |
|
597 | n = chlog.node(r) | |
598 | if n not in p: |
|
598 | if n not in p: | |
599 | h.append(n) |
|
599 | h.append(n) | |
600 | if n == stop: |
|
600 | if n == stop: | |
601 | break |
|
601 | break | |
602 | if r < stoprev: |
|
602 | if r < stoprev: | |
603 | break |
|
603 | break | |
604 | for pn in chlog.parents(n): |
|
604 | for pn in chlog.parents(n): | |
605 | p[pn] = 1 |
|
605 | p[pn] = 1 | |
606 | return h |
|
606 | return h | |
607 |
|
607 | |||
608 | def bundle(cg): |
|
608 | def bundle(cg): | |
609 | backupdir = repo.join("strip-backup") |
|
609 | backupdir = repo.join("strip-backup") | |
610 | if not os.path.isdir(backupdir): |
|
610 | if not os.path.isdir(backupdir): | |
611 | os.mkdir(backupdir) |
|
611 | os.mkdir(backupdir) | |
612 | name = os.path.join(backupdir, "%s" % revlog.short(rev)) |
|
612 | name = os.path.join(backupdir, "%s" % revlog.short(rev)) | |
613 | name = savename(name) |
|
613 | name = savename(name) | |
614 | self.ui.warn("saving bundle to %s\n" % name) |
|
614 | self.ui.warn("saving bundle to %s\n" % name) | |
615 | return changegroup.writebundle(cg, name, "HG10BZ") |
|
615 | return changegroup.writebundle(cg, name, "HG10BZ") | |
616 |
|
616 | |||
617 | def stripall(rev, revnum): |
|
617 | def stripall(rev, revnum): | |
618 | cl = repo.changelog |
|
618 | cl = repo.changelog | |
619 | c = cl.read(rev) |
|
619 | c = cl.read(rev) | |
620 | mm = repo.manifest.read(c[0]) |
|
620 | mm = repo.manifest.read(c[0]) | |
621 | seen = {} |
|
621 | seen = {} | |
622 |
|
622 | |||
623 | for x in xrange(revnum, cl.count()): |
|
623 | for x in xrange(revnum, cl.count()): | |
624 | c = cl.read(cl.node(x)) |
|
624 | c = cl.read(cl.node(x)) | |
625 | for f in c[3]: |
|
625 | for f in c[3]: | |
626 | if f in seen: |
|
626 | if f in seen: | |
627 | continue |
|
627 | continue | |
628 | seen[f] = 1 |
|
628 | seen[f] = 1 | |
629 | if f in mm: |
|
629 | if f in mm: | |
630 | filerev = mm[f] |
|
630 | filerev = mm[f] | |
631 | else: |
|
631 | else: | |
632 | filerev = 0 |
|
632 | filerev = 0 | |
633 | seen[f] = filerev |
|
633 | seen[f] = filerev | |
634 | # we go in two steps here so the strip loop happens in a |
|
634 | # we go in two steps here so the strip loop happens in a | |
635 | # sensible order. When stripping many files, this helps keep |
|
635 | # sensible order. When stripping many files, this helps keep | |
636 | # our disk access patterns under control. |
|
636 | # our disk access patterns under control. | |
637 | seen_list = seen.keys() |
|
637 | seen_list = seen.keys() | |
638 | seen_list.sort() |
|
638 | seen_list.sort() | |
639 | for f in seen_list: |
|
639 | for f in seen_list: | |
640 | ff = repo.file(f) |
|
640 | ff = repo.file(f) | |
641 | filerev = seen[f] |
|
641 | filerev = seen[f] | |
642 | if filerev != 0: |
|
642 | if filerev != 0: | |
643 | if filerev in ff.nodemap: |
|
643 | if filerev in ff.nodemap: | |
644 | filerev = ff.rev(filerev) |
|
644 | filerev = ff.rev(filerev) | |
645 | else: |
|
645 | else: | |
646 | filerev = 0 |
|
646 | filerev = 0 | |
647 | ff.strip(filerev, revnum) |
|
647 | ff.strip(filerev, revnum) | |
648 |
|
648 | |||
649 | if not wlock: |
|
649 | if not wlock: | |
650 | wlock = repo.wlock() |
|
650 | wlock = repo.wlock() | |
651 | lock = repo.lock() |
|
651 | lock = repo.lock() | |
652 | chlog = repo.changelog |
|
652 | chlog = repo.changelog | |
653 | # TODO delete the undo files, and handle undo of merge sets |
|
653 | # TODO delete the undo files, and handle undo of merge sets | |
654 | pp = chlog.parents(rev) |
|
654 | pp = chlog.parents(rev) | |
655 | revnum = chlog.rev(rev) |
|
655 | revnum = chlog.rev(rev) | |
656 |
|
656 | |||
657 | if update: |
|
657 | if update: | |
658 | self.check_localchanges(repo, refresh=False) |
|
658 | self.check_localchanges(repo, refresh=False) | |
659 | urev = self.qparents(repo, rev) |
|
659 | urev = self.qparents(repo, rev) | |
660 | hg.clean(repo, urev, wlock=wlock) |
|
660 | hg.clean(repo, urev, wlock=wlock) | |
661 | repo.dirstate.write() |
|
661 | repo.dirstate.write() | |
662 |
|
662 | |||
663 | # save is a list of all the branches we are truncating away |
|
663 | # save is a list of all the branches we are truncating away | |
664 | # that we actually want to keep. changegroup will be used |
|
664 | # that we actually want to keep. changegroup will be used | |
665 | # to preserve them and add them back after the truncate |
|
665 | # to preserve them and add them back after the truncate | |
666 | saveheads = [] |
|
666 | saveheads = [] | |
667 | savebases = {} |
|
667 | savebases = {} | |
668 |
|
668 | |||
669 | heads = limitheads(chlog, rev) |
|
669 | heads = limitheads(chlog, rev) | |
670 | seen = {} |
|
670 | seen = {} | |
671 |
|
671 | |||
672 | # search through all the heads, finding those where the revision |
|
672 | # search through all the heads, finding those where the revision | |
673 | # we want to strip away is an ancestor. Also look for merges |
|
673 | # we want to strip away is an ancestor. Also look for merges | |
674 | # that might be turned into new heads by the strip. |
|
674 | # that might be turned into new heads by the strip. | |
675 | while heads: |
|
675 | while heads: | |
676 | h = heads.pop() |
|
676 | h = heads.pop() | |
677 | n = h |
|
677 | n = h | |
678 | while True: |
|
678 | while True: | |
679 | seen[n] = 1 |
|
679 | seen[n] = 1 | |
680 | pp = chlog.parents(n) |
|
680 | pp = chlog.parents(n) | |
681 | if pp[1] != revlog.nullid: |
|
681 | if pp[1] != revlog.nullid: | |
682 | for p in pp: |
|
682 | for p in pp: | |
683 | if chlog.rev(p) > revnum and p not in seen: |
|
683 | if chlog.rev(p) > revnum and p not in seen: | |
684 | heads.append(p) |
|
684 | heads.append(p) | |
685 | if pp[0] == revlog.nullid: |
|
685 | if pp[0] == revlog.nullid: | |
686 | break |
|
686 | break | |
687 | if chlog.rev(pp[0]) < revnum: |
|
687 | if chlog.rev(pp[0]) < revnum: | |
688 | break |
|
688 | break | |
689 | n = pp[0] |
|
689 | n = pp[0] | |
690 | if n == rev: |
|
690 | if n == rev: | |
691 | break |
|
691 | break | |
692 | r = chlog.reachable(h, rev) |
|
692 | r = chlog.reachable(h, rev) | |
693 | if rev not in r: |
|
693 | if rev not in r: | |
694 | saveheads.append(h) |
|
694 | saveheads.append(h) | |
695 | for x in r: |
|
695 | for x in r: | |
696 | if chlog.rev(x) > revnum: |
|
696 | if chlog.rev(x) > revnum: | |
697 | savebases[x] = 1 |
|
697 | savebases[x] = 1 | |
698 |
|
698 | |||
699 | # create a changegroup for all the branches we need to keep |
|
699 | # create a changegroup for all the branches we need to keep | |
700 | if backup == "all": |
|
700 | if backup == "all": | |
701 | backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') |
|
701 | backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | |
702 | bundle(backupch) |
|
702 | bundle(backupch) | |
703 | if saveheads: |
|
703 | if saveheads: | |
704 | backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') |
|
704 | backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | |
705 | chgrpfile = bundle(backupch) |
|
705 | chgrpfile = bundle(backupch) | |
706 |
|
706 | |||
707 | stripall(rev, revnum) |
|
707 | stripall(rev, revnum) | |
708 |
|
708 | |||
709 | change = chlog.read(rev) |
|
709 | change = chlog.read(rev) | |
710 | chlog.strip(revnum, revnum) |
|
710 | chlog.strip(revnum, revnum) | |
711 | repo.manifest.strip(repo.manifest.rev(change[0]), revnum) |
|
711 | repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | |
712 | if saveheads: |
|
712 | if saveheads: | |
713 | self.ui.status("adding branch\n") |
|
713 | self.ui.status("adding branch\n") | |
714 | commands.unbundle(self.ui, repo, "file:%s" % chgrpfile, |
|
714 | commands.unbundle(self.ui, repo, "file:%s" % chgrpfile, | |
715 | update=False) |
|
715 | update=False) | |
716 | if backup != "strip": |
|
716 | if backup != "strip": | |
717 | os.unlink(chgrpfile) |
|
717 | os.unlink(chgrpfile) | |
718 |
|
718 | |||
719 | def isapplied(self, patch): |
|
719 | def isapplied(self, patch): | |
720 | """returns (index, rev, patch)""" |
|
720 | """returns (index, rev, patch)""" | |
721 | for i in xrange(len(self.applied)): |
|
721 | for i in xrange(len(self.applied)): | |
722 | a = self.applied[i] |
|
722 | a = self.applied[i] | |
723 | if a.name == patch: |
|
723 | if a.name == patch: | |
724 | return (i, a.rev, a.name) |
|
724 | return (i, a.rev, a.name) | |
725 | return None |
|
725 | return None | |
726 |
|
726 | |||
727 | # if the exact patch name does not exist, we try a few |
|
727 | # if the exact patch name does not exist, we try a few | |
728 | # variations. If strict is passed, we try only #1 |
|
728 | # variations. If strict is passed, we try only #1 | |
729 | # |
|
729 | # | |
730 | # 1) a number to indicate an offset in the series file |
|
730 | # 1) a number to indicate an offset in the series file | |
731 | # 2) a unique substring of the patch name was given |
|
731 | # 2) a unique substring of the patch name was given | |
732 | # 3) patchname[-+]num to indicate an offset in the series file |
|
732 | # 3) patchname[-+]num to indicate an offset in the series file | |
733 | def lookup(self, patch, strict=False): |
|
733 | def lookup(self, patch, strict=False): | |
734 | patch = patch and str(patch) |
|
734 | patch = patch and str(patch) | |
735 |
|
735 | |||
736 | def partial_name(s): |
|
736 | def partial_name(s): | |
737 | if s in self.series: |
|
737 | if s in self.series: | |
738 | return s |
|
738 | return s | |
739 | matches = [x for x in self.series if s in x] |
|
739 | matches = [x for x in self.series if s in x] | |
740 | if len(matches) > 1: |
|
740 | if len(matches) > 1: | |
741 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
741 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) | |
742 | for m in matches: |
|
742 | for m in matches: | |
743 | self.ui.warn(' %s\n' % m) |
|
743 | self.ui.warn(' %s\n' % m) | |
744 | return None |
|
744 | return None | |
745 | if matches: |
|
745 | if matches: | |
746 | return matches[0] |
|
746 | return matches[0] | |
747 | if len(self.series) > 0 and len(self.applied) > 0: |
|
747 | if len(self.series) > 0 and len(self.applied) > 0: | |
748 | if s == 'qtip': |
|
748 | if s == 'qtip': | |
749 | return self.series[self.series_end(True)-1] |
|
749 | return self.series[self.series_end(True)-1] | |
750 | if s == 'qbase': |
|
750 | if s == 'qbase': | |
751 | return self.series[0] |
|
751 | return self.series[0] | |
752 | return None |
|
752 | return None | |
753 | if patch == None: |
|
753 | if patch == None: | |
754 | return None |
|
754 | return None | |
755 |
|
755 | |||
756 | # we don't want to return a partial match until we make |
|
756 | # we don't want to return a partial match until we make | |
757 | # sure the file name passed in does not exist (checked below) |
|
757 | # sure the file name passed in does not exist (checked below) | |
758 | res = partial_name(patch) |
|
758 | res = partial_name(patch) | |
759 | if res and res == patch: |
|
759 | if res and res == patch: | |
760 | return res |
|
760 | return res | |
761 |
|
761 | |||
762 | if not os.path.isfile(self.join(patch)): |
|
762 | if not os.path.isfile(self.join(patch)): | |
763 | try: |
|
763 | try: | |
764 | sno = int(patch) |
|
764 | sno = int(patch) | |
765 | except(ValueError, OverflowError): |
|
765 | except(ValueError, OverflowError): | |
766 | pass |
|
766 | pass | |
767 | else: |
|
767 | else: | |
768 | if sno < len(self.series): |
|
768 | if sno < len(self.series): | |
769 | return self.series[sno] |
|
769 | return self.series[sno] | |
770 | if not strict: |
|
770 | if not strict: | |
771 | # return any partial match made above |
|
771 | # return any partial match made above | |
772 | if res: |
|
772 | if res: | |
773 | return res |
|
773 | return res | |
774 | minus = patch.rfind('-') |
|
774 | minus = patch.rfind('-') | |
775 | if minus >= 0: |
|
775 | if minus >= 0: | |
776 | res = partial_name(patch[:minus]) |
|
776 | res = partial_name(patch[:minus]) | |
777 | if res: |
|
777 | if res: | |
778 | i = self.series.index(res) |
|
778 | i = self.series.index(res) | |
779 | try: |
|
779 | try: | |
780 | off = int(patch[minus+1:] or 1) |
|
780 | off = int(patch[minus+1:] or 1) | |
781 | except(ValueError, OverflowError): |
|
781 | except(ValueError, OverflowError): | |
782 | pass |
|
782 | pass | |
783 | else: |
|
783 | else: | |
784 | if i - off >= 0: |
|
784 | if i - off >= 0: | |
785 | return self.series[i - off] |
|
785 | return self.series[i - off] | |
786 | plus = patch.rfind('+') |
|
786 | plus = patch.rfind('+') | |
787 | if plus >= 0: |
|
787 | if plus >= 0: | |
788 | res = partial_name(patch[:plus]) |
|
788 | res = partial_name(patch[:plus]) | |
789 | if res: |
|
789 | if res: | |
790 | i = self.series.index(res) |
|
790 | i = self.series.index(res) | |
791 | try: |
|
791 | try: | |
792 | off = int(patch[plus+1:] or 1) |
|
792 | off = int(patch[plus+1:] or 1) | |
793 | except(ValueError, OverflowError): |
|
793 | except(ValueError, OverflowError): | |
794 | pass |
|
794 | pass | |
795 | else: |
|
795 | else: | |
796 | if i + off < len(self.series): |
|
796 | if i + off < len(self.series): | |
797 | return self.series[i + off] |
|
797 | return self.series[i + off] | |
798 | raise util.Abort(_("patch %s not in series") % patch) |
|
798 | raise util.Abort(_("patch %s not in series") % patch) | |
799 |
|
799 | |||
800 | def push(self, repo, patch=None, force=False, list=False, |
|
800 | def push(self, repo, patch=None, force=False, list=False, | |
801 | mergeq=None, wlock=None): |
|
801 | mergeq=None, wlock=None): | |
802 | if not wlock: |
|
802 | if not wlock: | |
803 | wlock = repo.wlock() |
|
803 | wlock = repo.wlock() | |
804 | patch = self.lookup(patch) |
|
804 | patch = self.lookup(patch) | |
805 | if patch and self.isapplied(patch): |
|
805 | if patch and self.isapplied(patch): | |
806 | raise util.Abort(_("patch %s is already applied") % patch) |
|
806 | raise util.Abort(_("patch %s is already applied") % patch) | |
807 | if self.series_end() == len(self.series): |
|
807 | if self.series_end() == len(self.series): | |
808 | raise util.Abort(_("patch series fully applied")) |
|
808 | raise util.Abort(_("patch series fully applied")) | |
809 | if not force: |
|
809 | if not force: | |
810 | self.check_localchanges(repo) |
|
810 | self.check_localchanges(repo) | |
811 |
|
811 | |||
812 | self.applied_dirty = 1; |
|
812 | self.applied_dirty = 1; | |
813 | start = self.series_end() |
|
813 | start = self.series_end() | |
814 | if start > 0: |
|
814 | if start > 0: | |
815 | self.check_toppatch(repo) |
|
815 | self.check_toppatch(repo) | |
816 | if not patch: |
|
816 | if not patch: | |
817 | patch = self.series[start] |
|
817 | patch = self.series[start] | |
818 | end = start + 1 |
|
818 | end = start + 1 | |
819 | else: |
|
819 | else: | |
820 | end = self.series.index(patch, start) + 1 |
|
820 | end = self.series.index(patch, start) + 1 | |
821 | s = self.series[start:end] |
|
821 | s = self.series[start:end] | |
822 | if mergeq: |
|
822 | if mergeq: | |
823 | ret = self.mergepatch(repo, mergeq, s, wlock) |
|
823 | ret = self.mergepatch(repo, mergeq, s, wlock) | |
824 | else: |
|
824 | else: | |
825 | ret = self.apply(repo, s, list, wlock=wlock) |
|
825 | ret = self.apply(repo, s, list, wlock=wlock) | |
826 | top = self.applied[-1].name |
|
826 | top = self.applied[-1].name | |
827 | if ret[0]: |
|
827 | if ret[0]: | |
828 | self.ui.write("Errors during apply, please fix and refresh %s\n" % |
|
828 | self.ui.write("Errors during apply, please fix and refresh %s\n" % | |
829 | top) |
|
829 | top) | |
830 | else: |
|
830 | else: | |
831 | self.ui.write("Now at: %s\n" % top) |
|
831 | self.ui.write("Now at: %s\n" % top) | |
832 | return ret[0] |
|
832 | return ret[0] | |
833 |
|
833 | |||
834 | def pop(self, repo, patch=None, force=False, update=True, all=False, |
|
834 | def pop(self, repo, patch=None, force=False, update=True, all=False, | |
835 | wlock=None): |
|
835 | wlock=None): | |
836 | def getfile(f, rev): |
|
836 | def getfile(f, rev): | |
837 | t = repo.file(f).read(rev) |
|
837 | t = repo.file(f).read(rev) | |
838 | try: |
|
838 | try: | |
839 | repo.wfile(f, "w").write(t) |
|
839 | repo.wfile(f, "w").write(t) | |
840 | except IOError: |
|
840 | except IOError: | |
841 | try: |
|
841 | try: | |
842 | os.makedirs(os.path.dirname(repo.wjoin(f))) |
|
842 | os.makedirs(os.path.dirname(repo.wjoin(f))) | |
843 | except OSError, err: |
|
843 | except OSError, err: | |
844 | if err.errno != errno.EEXIST: raise |
|
844 | if err.errno != errno.EEXIST: raise | |
845 | repo.wfile(f, "w").write(t) |
|
845 | repo.wfile(f, "w").write(t) | |
846 |
|
846 | |||
847 | if not wlock: |
|
847 | if not wlock: | |
848 | wlock = repo.wlock() |
|
848 | wlock = repo.wlock() | |
849 | if patch: |
|
849 | if patch: | |
850 | # index, rev, patch |
|
850 | # index, rev, patch | |
851 | info = self.isapplied(patch) |
|
851 | info = self.isapplied(patch) | |
852 | if not info: |
|
852 | if not info: | |
853 | patch = self.lookup(patch) |
|
853 | patch = self.lookup(patch) | |
854 | info = self.isapplied(patch) |
|
854 | info = self.isapplied(patch) | |
855 | if not info: |
|
855 | if not info: | |
856 | raise util.Abort(_("patch %s is not applied") % patch) |
|
856 | raise util.Abort(_("patch %s is not applied") % patch) | |
857 | if len(self.applied) == 0: |
|
857 | if len(self.applied) == 0: | |
858 | raise util.Abort(_("no patches applied")) |
|
858 | raise util.Abort(_("no patches applied")) | |
859 |
|
859 | |||
860 | if not update: |
|
860 | if not update: | |
861 | parents = repo.dirstate.parents() |
|
861 | parents = repo.dirstate.parents() | |
862 | rr = [ revlog.bin(x.rev) for x in self.applied ] |
|
862 | rr = [ revlog.bin(x.rev) for x in self.applied ] | |
863 | for p in parents: |
|
863 | for p in parents: | |
864 | if p in rr: |
|
864 | if p in rr: | |
865 | self.ui.warn("qpop: forcing dirstate update\n") |
|
865 | self.ui.warn("qpop: forcing dirstate update\n") | |
866 | update = True |
|
866 | update = True | |
867 |
|
867 | |||
868 | if not force and update: |
|
868 | if not force and update: | |
869 | self.check_localchanges(repo) |
|
869 | self.check_localchanges(repo) | |
870 |
|
870 | |||
871 | self.applied_dirty = 1; |
|
871 | self.applied_dirty = 1; | |
872 | end = len(self.applied) |
|
872 | end = len(self.applied) | |
873 | if not patch: |
|
873 | if not patch: | |
874 | if all: |
|
874 | if all: | |
875 | popi = 0 |
|
875 | popi = 0 | |
876 | else: |
|
876 | else: | |
877 | popi = len(self.applied) - 1 |
|
877 | popi = len(self.applied) - 1 | |
878 | else: |
|
878 | else: | |
879 | popi = info[0] + 1 |
|
879 | popi = info[0] + 1 | |
880 | if popi >= end: |
|
880 | if popi >= end: | |
881 | self.ui.warn("qpop: %s is already at the top\n" % patch) |
|
881 | self.ui.warn("qpop: %s is already at the top\n" % patch) | |
882 | return |
|
882 | return | |
883 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] |
|
883 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] | |
884 |
|
884 | |||
885 | start = info[0] |
|
885 | start = info[0] | |
886 | rev = revlog.bin(info[1]) |
|
886 | rev = revlog.bin(info[1]) | |
887 |
|
887 | |||
888 | # we know there are no local changes, so we can make a simplified |
|
888 | # we know there are no local changes, so we can make a simplified | |
889 | # form of hg.update. |
|
889 | # form of hg.update. | |
890 | if update: |
|
890 | if update: | |
891 | top = self.check_toppatch(repo) |
|
891 | top = self.check_toppatch(repo) | |
892 | qp = self.qparents(repo, rev) |
|
892 | qp = self.qparents(repo, rev) | |
893 | changes = repo.changelog.read(qp) |
|
893 | changes = repo.changelog.read(qp) | |
894 | mmap = repo.manifest.read(changes[0]) |
|
894 | mmap = repo.manifest.read(changes[0]) | |
895 | m, a, r, d, u = repo.status(qp, top)[:5] |
|
895 | m, a, r, d, u = repo.status(qp, top)[:5] | |
896 | if d: |
|
896 | if d: | |
897 | raise util.Abort("deletions found between repo revs") |
|
897 | raise util.Abort("deletions found between repo revs") | |
898 | for f in m: |
|
898 | for f in m: | |
899 | getfile(f, mmap[f]) |
|
899 | getfile(f, mmap[f]) | |
900 | for f in r: |
|
900 | for f in r: | |
901 | getfile(f, mmap[f]) |
|
901 | getfile(f, mmap[f]) | |
902 | util.set_exec(repo.wjoin(f), mmap.execf(f)) |
|
902 | util.set_exec(repo.wjoin(f), mmap.execf(f)) | |
903 | repo.dirstate.update(m + r, 'n') |
|
903 | repo.dirstate.update(m + r, 'n') | |
904 | for f in a: |
|
904 | for f in a: | |
905 | try: |
|
905 | try: | |
906 | os.unlink(repo.wjoin(f)) |
|
906 | os.unlink(repo.wjoin(f)) | |
907 | except OSError, e: |
|
907 | except OSError, e: | |
908 | if e.errno != errno.ENOENT: |
|
908 | if e.errno != errno.ENOENT: | |
909 | raise |
|
909 | raise | |
910 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) |
|
910 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
911 | except: pass |
|
911 | except: pass | |
912 | if a: |
|
912 | if a: | |
913 | repo.dirstate.forget(a) |
|
913 | repo.dirstate.forget(a) | |
914 | repo.dirstate.setparents(qp, revlog.nullid) |
|
914 | repo.dirstate.setparents(qp, revlog.nullid) | |
915 | self.strip(repo, rev, update=False, backup='strip', wlock=wlock) |
|
915 | self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | |
916 | del self.applied[start:end] |
|
916 | del self.applied[start:end] | |
917 | if len(self.applied): |
|
917 | if len(self.applied): | |
918 | self.ui.write("Now at: %s\n" % self.applied[-1].name) |
|
918 | self.ui.write("Now at: %s\n" % self.applied[-1].name) | |
919 | else: |
|
919 | else: | |
920 | self.ui.write("Patch queue now empty\n") |
|
920 | self.ui.write("Patch queue now empty\n") | |
921 |
|
921 | |||
922 | def diff(self, repo, pats, opts): |
|
922 | def diff(self, repo, pats, opts): | |
923 | top = self.check_toppatch(repo) |
|
923 | top = self.check_toppatch(repo) | |
924 | if not top: |
|
924 | if not top: | |
925 | self.ui.write("No patches applied\n") |
|
925 | self.ui.write("No patches applied\n") | |
926 | return |
|
926 | return | |
927 | qp = self.qparents(repo, top) |
|
927 | qp = self.qparents(repo, top) | |
928 | if opts.get('git'): |
|
928 | if opts.get('git'): | |
929 | self.diffopts().git = True |
|
929 | self.diffopts().git = True | |
930 | self.printdiff(repo, qp, files=pats, opts=opts) |
|
930 | self.printdiff(repo, qp, files=pats, opts=opts) | |
931 |
|
931 | |||
932 | def refresh(self, repo, pats=None, **opts): |
|
932 | def refresh(self, repo, pats=None, **opts): | |
933 | if len(self.applied) == 0: |
|
933 | if len(self.applied) == 0: | |
934 | self.ui.write("No patches applied\n") |
|
934 | self.ui.write("No patches applied\n") | |
935 | return 1 |
|
935 | return 1 | |
936 | wlock = repo.wlock() |
|
936 | wlock = repo.wlock() | |
937 | self.check_toppatch(repo) |
|
937 | self.check_toppatch(repo) | |
938 | (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) |
|
938 | (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) | |
939 | top = revlog.bin(top) |
|
939 | top = revlog.bin(top) | |
940 | cparents = repo.changelog.parents(top) |
|
940 | cparents = repo.changelog.parents(top) | |
941 | patchparent = self.qparents(repo, top) |
|
941 | patchparent = self.qparents(repo, top) | |
942 | message, comments, user, date, patchfound = self.readheaders(patchfn) |
|
942 | message, comments, user, date, patchfound = self.readheaders(patchfn) | |
943 |
|
943 | |||
944 | patchf = self.opener(patchfn, "w") |
|
944 | patchf = self.opener(patchfn, "w") | |
945 | msg = opts.get('msg', '').rstrip() |
|
945 | msg = opts.get('msg', '').rstrip() | |
946 | if msg: |
|
946 | if msg: | |
947 | if comments: |
|
947 | if comments: | |
948 | # Remove existing message. |
|
948 | # Remove existing message. | |
949 | ci = 0 |
|
949 | ci = 0 | |
950 | for mi in xrange(len(message)): |
|
950 | for mi in xrange(len(message)): | |
951 | while message[mi] != comments[ci]: |
|
951 | while message[mi] != comments[ci]: | |
952 | ci += 1 |
|
952 | ci += 1 | |
953 | del comments[ci] |
|
953 | del comments[ci] | |
954 | comments.append(msg) |
|
954 | comments.append(msg) | |
955 | if comments: |
|
955 | if comments: | |
956 | comments = "\n".join(comments) + '\n\n' |
|
956 | comments = "\n".join(comments) + '\n\n' | |
957 | patchf.write(comments) |
|
957 | patchf.write(comments) | |
958 |
|
958 | |||
959 | if opts.get('git'): |
|
959 | if opts.get('git'): | |
960 | self.diffopts().git = True |
|
960 | self.diffopts().git = True | |
961 | fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
|
961 | fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | |
962 | tip = repo.changelog.tip() |
|
962 | tip = repo.changelog.tip() | |
963 | if top == tip: |
|
963 | if top == tip: | |
964 | # if the top of our patch queue is also the tip, there is an |
|
964 | # if the top of our patch queue is also the tip, there is an | |
965 | # optimization here. We update the dirstate in place and strip |
|
965 | # optimization here. We update the dirstate in place and strip | |
966 | # off the tip commit. Then just commit the current directory |
|
966 | # off the tip commit. Then just commit the current directory | |
967 | # tree. We can also send repo.commit the list of files |
|
967 | # tree. We can also send repo.commit the list of files | |
968 | # changed to speed up the diff |
|
968 | # changed to speed up the diff | |
969 | # |
|
969 | # | |
970 | # in short mode, we only diff the files included in the |
|
970 | # in short mode, we only diff the files included in the | |
971 | # patch already |
|
971 | # patch already | |
972 | # |
|
972 | # | |
973 | # this should really read: |
|
973 | # this should really read: | |
974 | # mm, dd, aa, aa2, uu = repo.status(tip, patchparent)[:5] |
|
974 | # mm, dd, aa, aa2, uu = repo.status(tip, patchparent)[:5] | |
975 | # but we do it backwards to take advantage of manifest/chlog |
|
975 | # but we do it backwards to take advantage of manifest/chlog | |
976 | # caching against the next repo.status call |
|
976 | # caching against the next repo.status call | |
977 | # |
|
977 | # | |
978 | mm, aa, dd, aa2, uu = repo.status(patchparent, tip)[:5] |
|
978 | mm, aa, dd, aa2, uu = repo.status(patchparent, tip)[:5] | |
979 | changes = repo.changelog.read(tip) |
|
979 | changes = repo.changelog.read(tip) | |
980 | man = repo.manifest.read(changes[0]) |
|
980 | man = repo.manifest.read(changes[0]) | |
981 | aaa = aa[:] |
|
981 | aaa = aa[:] | |
982 | if opts.get('short'): |
|
982 | if opts.get('short'): | |
983 | filelist = mm + aa + dd |
|
983 | filelist = mm + aa + dd | |
984 | else: |
|
984 | else: | |
985 | filelist = None |
|
985 | filelist = None | |
986 | m, a, r, d, u = repo.status(files=filelist)[:5] |
|
986 | m, a, r, d, u = repo.status(files=filelist)[:5] | |
987 |
|
987 | |||
988 | # we might end up with files that were added between tip and |
|
988 | # we might end up with files that were added between tip and | |
989 | # the dirstate parent, but then changed in the local dirstate. |
|
989 | # the dirstate parent, but then changed in the local dirstate. | |
990 | # in this case, we want them to only show up in the added section |
|
990 | # in this case, we want them to only show up in the added section | |
991 | for x in m: |
|
991 | for x in m: | |
992 | if x not in aa: |
|
992 | if x not in aa: | |
993 | mm.append(x) |
|
993 | mm.append(x) | |
994 | # we might end up with files added by the local dirstate that |
|
994 | # we might end up with files added by the local dirstate that | |
995 | # were deleted by the patch. In this case, they should only |
|
995 | # were deleted by the patch. In this case, they should only | |
996 | # show up in the changed section. |
|
996 | # show up in the changed section. | |
997 | for x in a: |
|
997 | for x in a: | |
998 | if x in dd: |
|
998 | if x in dd: | |
999 | del dd[dd.index(x)] |
|
999 | del dd[dd.index(x)] | |
1000 | mm.append(x) |
|
1000 | mm.append(x) | |
1001 | else: |
|
1001 | else: | |
1002 | aa.append(x) |
|
1002 | aa.append(x) | |
1003 | # make sure any files deleted in the local dirstate |
|
1003 | # make sure any files deleted in the local dirstate | |
1004 | # are not in the add or change column of the patch |
|
1004 | # are not in the add or change column of the patch | |
1005 | forget = [] |
|
1005 | forget = [] | |
1006 | for x in d + r: |
|
1006 | for x in d + r: | |
1007 | if x in aa: |
|
1007 | if x in aa: | |
1008 | del aa[aa.index(x)] |
|
1008 | del aa[aa.index(x)] | |
1009 | forget.append(x) |
|
1009 | forget.append(x) | |
1010 | continue |
|
1010 | continue | |
1011 | elif x in mm: |
|
1011 | elif x in mm: | |
1012 | del mm[mm.index(x)] |
|
1012 | del mm[mm.index(x)] | |
1013 | dd.append(x) |
|
1013 | dd.append(x) | |
1014 |
|
1014 | |||
1015 | m = util.unique(mm) |
|
1015 | m = util.unique(mm) | |
1016 | r = util.unique(dd) |
|
1016 | r = util.unique(dd) | |
1017 | a = util.unique(aa) |
|
1017 | a = util.unique(aa) | |
1018 | filelist = filter(matchfn, util.unique(m + r + a)) |
|
1018 | filelist = filter(matchfn, util.unique(m + r + a)) | |
1019 | patch.diff(repo, patchparent, files=filelist, match=matchfn, |
|
1019 | patch.diff(repo, patchparent, files=filelist, match=matchfn, | |
1020 | fp=patchf, changes=(m, a, r, [], u), |
|
1020 | fp=patchf, changes=(m, a, r, [], u), | |
1021 | opts=self.diffopts()) |
|
1021 | opts=self.diffopts()) | |
1022 | patchf.close() |
|
1022 | patchf.close() | |
1023 |
|
1023 | |||
1024 | repo.dirstate.setparents(*cparents) |
|
1024 | repo.dirstate.setparents(*cparents) | |
1025 | copies = {} |
|
1025 | copies = {} | |
1026 | for dst in a: |
|
1026 | for dst in a: | |
1027 | src = repo.dirstate.copied(dst) |
|
1027 | src = repo.dirstate.copied(dst) | |
1028 | if src is None: |
|
1028 | if src is None: | |
1029 | continue |
|
1029 | continue | |
1030 | copies.setdefault(src, []).append(dst) |
|
1030 | copies.setdefault(src, []).append(dst) | |
1031 | repo.dirstate.update(a, 'a') |
|
1031 | repo.dirstate.update(a, 'a') | |
1032 | # remember the copies between patchparent and tip |
|
1032 | # remember the copies between patchparent and tip | |
1033 | # this may be slow, so don't do it if we're not tracking copies |
|
1033 | # this may be slow, so don't do it if we're not tracking copies | |
1034 | if self.diffopts().git: |
|
1034 | if self.diffopts().git: | |
1035 | for dst in aaa: |
|
1035 | for dst in aaa: | |
1036 | f = repo.file(dst) |
|
1036 | f = repo.file(dst) | |
1037 | src = f.renamed(man[dst]) |
|
1037 | src = f.renamed(man[dst]) | |
1038 | if src: |
|
1038 | if src: | |
1039 | copies[src[0]] = copies.get(dst, []) |
|
1039 | copies[src[0]] = copies.get(dst, []) | |
1040 | if dst in a: |
|
1040 | if dst in a: | |
1041 | copies[src[0]].append(dst) |
|
1041 | copies[src[0]].append(dst) | |
1042 | # we can't copy a file created by the patch itself |
|
1042 | # we can't copy a file created by the patch itself | |
1043 | if dst in copies: |
|
1043 | if dst in copies: | |
1044 | del copies[dst] |
|
1044 | del copies[dst] | |
1045 | for src, dsts in copies.iteritems(): |
|
1045 | for src, dsts in copies.iteritems(): | |
1046 | for dst in dsts: |
|
1046 | for dst in dsts: | |
1047 | repo.dirstate.copy(src, dst) |
|
1047 | repo.dirstate.copy(src, dst) | |
1048 | repo.dirstate.update(r, 'r') |
|
1048 | repo.dirstate.update(r, 'r') | |
1049 | # if the patch excludes a modified file, mark that file with mtime=0 |
|
1049 | # if the patch excludes a modified file, mark that file with mtime=0 | |
1050 | # so status can see it. |
|
1050 | # so status can see it. | |
1051 | mm = [] |
|
1051 | mm = [] | |
1052 | for i in xrange(len(m)-1, -1, -1): |
|
1052 | for i in xrange(len(m)-1, -1, -1): | |
1053 | if not matchfn(m[i]): |
|
1053 | if not matchfn(m[i]): | |
1054 | mm.append(m[i]) |
|
1054 | mm.append(m[i]) | |
1055 | del m[i] |
|
1055 | del m[i] | |
1056 | repo.dirstate.update(m, 'n') |
|
1056 | repo.dirstate.update(m, 'n') | |
1057 | repo.dirstate.update(mm, 'n', st_mtime=0) |
|
1057 | repo.dirstate.update(mm, 'n', st_mtime=0) | |
1058 | repo.dirstate.forget(forget) |
|
1058 | repo.dirstate.forget(forget) | |
1059 |
|
1059 | |||
1060 | if not msg: |
|
1060 | if not msg: | |
1061 | if not message: |
|
1061 | if not message: | |
1062 | message = "patch queue: %s\n" % patchfn |
|
1062 | message = "patch queue: %s\n" % patchfn | |
1063 | else: |
|
1063 | else: | |
1064 | message = "\n".join(message) |
|
1064 | message = "\n".join(message) | |
1065 | else: |
|
1065 | else: | |
1066 | message = msg |
|
1066 | message = msg | |
1067 |
|
1067 | |||
1068 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
|
1068 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) | |
1069 | n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) |
|
1069 | n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | |
1070 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) |
|
1070 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) | |
1071 | self.applied_dirty = 1 |
|
1071 | self.applied_dirty = 1 | |
1072 | else: |
|
1072 | else: | |
1073 | self.printdiff(repo, patchparent, fp=patchf) |
|
1073 | self.printdiff(repo, patchparent, fp=patchf) | |
1074 | patchf.close() |
|
1074 | patchf.close() | |
1075 | added = repo.status()[1] |
|
1075 | added = repo.status()[1] | |
1076 | for a in added: |
|
1076 | for a in added: | |
1077 | f = repo.wjoin(a) |
|
1077 | f = repo.wjoin(a) | |
1078 | try: |
|
1078 | try: | |
1079 | os.unlink(f) |
|
1079 | os.unlink(f) | |
1080 | except OSError, e: |
|
1080 | except OSError, e: | |
1081 | if e.errno != errno.ENOENT: |
|
1081 | if e.errno != errno.ENOENT: | |
1082 | raise |
|
1082 | raise | |
1083 | try: os.removedirs(os.path.dirname(f)) |
|
1083 | try: os.removedirs(os.path.dirname(f)) | |
1084 | except: pass |
|
1084 | except: pass | |
1085 | # forget the file copies in the dirstate |
|
1085 | # forget the file copies in the dirstate | |
1086 | # push should readd the files later on |
|
1086 | # push should readd the files later on | |
1087 | repo.dirstate.forget(added) |
|
1087 | repo.dirstate.forget(added) | |
1088 | self.pop(repo, force=True, wlock=wlock) |
|
1088 | self.pop(repo, force=True, wlock=wlock) | |
1089 | self.push(repo, force=True, wlock=wlock) |
|
1089 | self.push(repo, force=True, wlock=wlock) | |
1090 |
|
1090 | |||
1091 | def init(self, repo, create=False): |
|
1091 | def init(self, repo, create=False): | |
1092 | if os.path.isdir(self.path): |
|
1092 | if os.path.isdir(self.path): | |
1093 | raise util.Abort(_("patch queue directory already exists")) |
|
1093 | raise util.Abort(_("patch queue directory already exists")) | |
1094 | os.mkdir(self.path) |
|
1094 | os.mkdir(self.path) | |
1095 | if create: |
|
1095 | if create: | |
1096 | return self.qrepo(create=True) |
|
1096 | return self.qrepo(create=True) | |
1097 |
|
1097 | |||
1098 | def unapplied(self, repo, patch=None): |
|
1098 | def unapplied(self, repo, patch=None): | |
1099 | if patch and patch not in self.series: |
|
1099 | if patch and patch not in self.series: | |
1100 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1100 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1101 | if not patch: |
|
1101 | if not patch: | |
1102 | start = self.series_end() |
|
1102 | start = self.series_end() | |
1103 | else: |
|
1103 | else: | |
1104 | start = self.series.index(patch) + 1 |
|
1104 | start = self.series.index(patch) + 1 | |
1105 | unapplied = [] |
|
1105 | unapplied = [] | |
1106 | for i in xrange(start, len(self.series)): |
|
1106 | for i in xrange(start, len(self.series)): | |
1107 | pushable, reason = self.pushable(i) |
|
1107 | pushable, reason = self.pushable(i) | |
1108 | if pushable: |
|
1108 | if pushable: | |
1109 | unapplied.append((i, self.series[i])) |
|
1109 | unapplied.append((i, self.series[i])) | |
1110 | self.explain_pushable(i) |
|
1110 | self.explain_pushable(i) | |
1111 | return unapplied |
|
1111 | return unapplied | |
1112 |
|
1112 | |||
1113 | def qseries(self, repo, missing=None, start=0, length=0, status=None, |
|
1113 | def qseries(self, repo, missing=None, start=0, length=0, status=None, | |
1114 | summary=False): |
|
1114 | summary=False): | |
1115 | def displayname(patchname): |
|
1115 | def displayname(patchname): | |
1116 | if summary: |
|
1116 | if summary: | |
1117 | msg = self.readheaders(patchname)[0] |
|
1117 | msg = self.readheaders(patchname)[0] | |
1118 | msg = msg and ': ' + msg[0] or ': ' |
|
1118 | msg = msg and ': ' + msg[0] or ': ' | |
1119 | else: |
|
1119 | else: | |
1120 | msg = '' |
|
1120 | msg = '' | |
1121 | return '%s%s' % (patchname, msg) |
|
1121 | return '%s%s' % (patchname, msg) | |
1122 |
|
1122 | |||
1123 | def pname(i): |
|
1123 | def pname(i): | |
1124 | if status == 'A': |
|
1124 | if status == 'A': | |
1125 | return self.applied[i].name |
|
1125 | return self.applied[i].name | |
1126 | else: |
|
1126 | else: | |
1127 | return self.series[i] |
|
1127 | return self.series[i] | |
1128 |
|
1128 | |||
1129 | applied = dict.fromkeys([p.name for p in self.applied]) |
|
1129 | applied = dict.fromkeys([p.name for p in self.applied]) | |
1130 | if not length: |
|
1130 | if not length: | |
1131 | length = len(self.series) - start |
|
1131 | length = len(self.series) - start | |
1132 | if not missing: |
|
1132 | if not missing: | |
1133 | for i in xrange(start, start+length): |
|
1133 | for i in xrange(start, start+length): | |
1134 | pfx = '' |
|
1134 | pfx = '' | |
1135 | patch = pname(i) |
|
1135 | patch = pname(i) | |
1136 | if self.ui.verbose: |
|
1136 | if self.ui.verbose: | |
1137 | if patch in applied: |
|
1137 | if patch in applied: | |
1138 | stat = 'A' |
|
1138 | stat = 'A' | |
1139 | elif self.pushable(i)[0]: |
|
1139 | elif self.pushable(i)[0]: | |
1140 | stat = 'U' |
|
1140 | stat = 'U' | |
1141 | else: |
|
1141 | else: | |
1142 | stat = 'G' |
|
1142 | stat = 'G' | |
1143 | pfx = '%d %s ' % (i, stat) |
|
1143 | pfx = '%d %s ' % (i, stat) | |
1144 | self.ui.write('%s%s\n' % (pfx, displayname(patch))) |
|
1144 | self.ui.write('%s%s\n' % (pfx, displayname(patch))) | |
1145 | else: |
|
1145 | else: | |
1146 | msng_list = [] |
|
1146 | msng_list = [] | |
1147 | for root, dirs, files in os.walk(self.path): |
|
1147 | for root, dirs, files in os.walk(self.path): | |
1148 | d = root[len(self.path) + 1:] |
|
1148 | d = root[len(self.path) + 1:] | |
1149 | for f in files: |
|
1149 | for f in files: | |
1150 | fl = os.path.join(d, f) |
|
1150 | fl = os.path.join(d, f) | |
1151 | if (fl not in self.series and |
|
1151 | if (fl not in self.series and | |
1152 | fl not in (self.status_path, self.series_path) |
|
1152 | fl not in (self.status_path, self.series_path) | |
1153 | and not fl.startswith('.')): |
|
1153 | and not fl.startswith('.')): | |
1154 | msng_list.append(fl) |
|
1154 | msng_list.append(fl) | |
1155 | msng_list.sort() |
|
1155 | msng_list.sort() | |
1156 | for x in msng_list: |
|
1156 | for x in msng_list: | |
1157 | pfx = self.ui.verbose and ('D ') or '' |
|
1157 | pfx = self.ui.verbose and ('D ') or '' | |
1158 | self.ui.write("%s%s\n" % (pfx, displayname(x))) |
|
1158 | self.ui.write("%s%s\n" % (pfx, displayname(x))) | |
1159 |
|
1159 | |||
1160 | def issaveline(self, l): |
|
1160 | def issaveline(self, l): | |
1161 | if l.name == '.hg.patches.save.line': |
|
1161 | if l.name == '.hg.patches.save.line': | |
1162 | return True |
|
1162 | return True | |
1163 |
|
1163 | |||
1164 | def qrepo(self, create=False): |
|
1164 | def qrepo(self, create=False): | |
1165 | if create or os.path.isdir(self.join(".hg")): |
|
1165 | if create or os.path.isdir(self.join(".hg")): | |
1166 | return hg.repository(self.ui, path=self.path, create=create) |
|
1166 | return hg.repository(self.ui, path=self.path, create=create) | |
1167 |
|
1167 | |||
1168 | def restore(self, repo, rev, delete=None, qupdate=None): |
|
1168 | def restore(self, repo, rev, delete=None, qupdate=None): | |
1169 | c = repo.changelog.read(rev) |
|
1169 | c = repo.changelog.read(rev) | |
1170 | desc = c[4].strip() |
|
1170 | desc = c[4].strip() | |
1171 | lines = desc.splitlines() |
|
1171 | lines = desc.splitlines() | |
1172 | i = 0 |
|
1172 | i = 0 | |
1173 | datastart = None |
|
1173 | datastart = None | |
1174 | series = [] |
|
1174 | series = [] | |
1175 | applied = [] |
|
1175 | applied = [] | |
1176 | qpp = None |
|
1176 | qpp = None | |
1177 | for i in xrange(0, len(lines)): |
|
1177 | for i in xrange(0, len(lines)): | |
1178 | if lines[i] == 'Patch Data:': |
|
1178 | if lines[i] == 'Patch Data:': | |
1179 | datastart = i + 1 |
|
1179 | datastart = i + 1 | |
1180 | elif lines[i].startswith('Dirstate:'): |
|
1180 | elif lines[i].startswith('Dirstate:'): | |
1181 | l = lines[i].rstrip() |
|
1181 | l = lines[i].rstrip() | |
1182 | l = l[10:].split(' ') |
|
1182 | l = l[10:].split(' ') | |
1183 | qpp = [ hg.bin(x) for x in l ] |
|
1183 | qpp = [ hg.bin(x) for x in l ] | |
1184 | elif datastart != None: |
|
1184 | elif datastart != None: | |
1185 | l = lines[i].rstrip() |
|
1185 | l = lines[i].rstrip() | |
1186 | se = statusentry(l) |
|
1186 | se = statusentry(l) | |
1187 | file_ = se.name |
|
1187 | file_ = se.name | |
1188 | if se.rev: |
|
1188 | if se.rev: | |
1189 | applied.append(se) |
|
1189 | applied.append(se) | |
1190 | else: |
|
1190 | else: | |
1191 | series.append(file_) |
|
1191 | series.append(file_) | |
1192 | if datastart == None: |
|
1192 | if datastart == None: | |
1193 | self.ui.warn("No saved patch data found\n") |
|
1193 | self.ui.warn("No saved patch data found\n") | |
1194 | return 1 |
|
1194 | return 1 | |
1195 | self.ui.warn("restoring status: %s\n" % lines[0]) |
|
1195 | self.ui.warn("restoring status: %s\n" % lines[0]) | |
1196 | self.full_series = series |
|
1196 | self.full_series = series | |
1197 | self.applied = applied |
|
1197 | self.applied = applied | |
1198 | self.parse_series() |
|
1198 | self.parse_series() | |
1199 | self.series_dirty = 1 |
|
1199 | self.series_dirty = 1 | |
1200 | self.applied_dirty = 1 |
|
1200 | self.applied_dirty = 1 | |
1201 | heads = repo.changelog.heads() |
|
1201 | heads = repo.changelog.heads() | |
1202 | if delete: |
|
1202 | if delete: | |
1203 | if rev not in heads: |
|
1203 | if rev not in heads: | |
1204 | self.ui.warn("save entry has children, leaving it alone\n") |
|
1204 | self.ui.warn("save entry has children, leaving it alone\n") | |
1205 | else: |
|
1205 | else: | |
1206 | self.ui.warn("removing save entry %s\n" % hg.short(rev)) |
|
1206 | self.ui.warn("removing save entry %s\n" % hg.short(rev)) | |
1207 | pp = repo.dirstate.parents() |
|
1207 | pp = repo.dirstate.parents() | |
1208 | if rev in pp: |
|
1208 | if rev in pp: | |
1209 | update = True |
|
1209 | update = True | |
1210 | else: |
|
1210 | else: | |
1211 | update = False |
|
1211 | update = False | |
1212 | self.strip(repo, rev, update=update, backup='strip') |
|
1212 | self.strip(repo, rev, update=update, backup='strip') | |
1213 | if qpp: |
|
1213 | if qpp: | |
1214 | self.ui.warn("saved queue repository parents: %s %s\n" % |
|
1214 | self.ui.warn("saved queue repository parents: %s %s\n" % | |
1215 | (hg.short(qpp[0]), hg.short(qpp[1]))) |
|
1215 | (hg.short(qpp[0]), hg.short(qpp[1]))) | |
1216 | if qupdate: |
|
1216 | if qupdate: | |
1217 | print "queue directory updating" |
|
1217 | print "queue directory updating" | |
1218 | r = self.qrepo() |
|
1218 | r = self.qrepo() | |
1219 | if not r: |
|
1219 | if not r: | |
1220 | self.ui.warn("Unable to load queue repository\n") |
|
1220 | self.ui.warn("Unable to load queue repository\n") | |
1221 | return 1 |
|
1221 | return 1 | |
1222 | hg.clean(r, qpp[0]) |
|
1222 | hg.clean(r, qpp[0]) | |
1223 |
|
1223 | |||
1224 | def save(self, repo, msg=None): |
|
1224 | def save(self, repo, msg=None): | |
1225 | if len(self.applied) == 0: |
|
1225 | if len(self.applied) == 0: | |
1226 | self.ui.warn("save: no patches applied, exiting\n") |
|
1226 | self.ui.warn("save: no patches applied, exiting\n") | |
1227 | return 1 |
|
1227 | return 1 | |
1228 | if self.issaveline(self.applied[-1]): |
|
1228 | if self.issaveline(self.applied[-1]): | |
1229 | self.ui.warn("status is already saved\n") |
|
1229 | self.ui.warn("status is already saved\n") | |
1230 | return 1 |
|
1230 | return 1 | |
1231 |
|
1231 | |||
1232 | ar = [ ':' + x for x in self.full_series ] |
|
1232 | ar = [ ':' + x for x in self.full_series ] | |
1233 | if not msg: |
|
1233 | if not msg: | |
1234 | msg = "hg patches saved state" |
|
1234 | msg = "hg patches saved state" | |
1235 | else: |
|
1235 | else: | |
1236 | msg = "hg patches: " + msg.rstrip('\r\n') |
|
1236 | msg = "hg patches: " + msg.rstrip('\r\n') | |
1237 | r = self.qrepo() |
|
1237 | r = self.qrepo() | |
1238 | if r: |
|
1238 | if r: | |
1239 | pp = r.dirstate.parents() |
|
1239 | pp = r.dirstate.parents() | |
1240 | msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) |
|
1240 | msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
1241 | msg += "\n\nPatch Data:\n" |
|
1241 | msg += "\n\nPatch Data:\n" | |
1242 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and |
|
1242 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and | |
1243 | "\n".join(ar) + '\n' or "") |
|
1243 | "\n".join(ar) + '\n' or "") | |
1244 | n = repo.commit(None, text, user=None, force=1) |
|
1244 | n = repo.commit(None, text, user=None, force=1) | |
1245 | if not n: |
|
1245 | if not n: | |
1246 | self.ui.warn("repo commit failed\n") |
|
1246 | self.ui.warn("repo commit failed\n") | |
1247 | return 1 |
|
1247 | return 1 | |
1248 | self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line')) |
|
1248 | self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line')) | |
1249 | self.applied_dirty = 1 |
|
1249 | self.applied_dirty = 1 | |
1250 |
|
1250 | |||
1251 | def full_series_end(self): |
|
1251 | def full_series_end(self): | |
1252 | if len(self.applied) > 0: |
|
1252 | if len(self.applied) > 0: | |
1253 | p = self.applied[-1].name |
|
1253 | p = self.applied[-1].name | |
1254 | end = self.find_series(p) |
|
1254 | end = self.find_series(p) | |
1255 | if end == None: |
|
1255 | if end == None: | |
1256 | return len(self.full_series) |
|
1256 | return len(self.full_series) | |
1257 | return end + 1 |
|
1257 | return end + 1 | |
1258 | return 0 |
|
1258 | return 0 | |
1259 |
|
1259 | |||
1260 | def series_end(self, all_patches=False): |
|
1260 | def series_end(self, all_patches=False): | |
1261 | end = 0 |
|
1261 | end = 0 | |
1262 | def next(start): |
|
1262 | def next(start): | |
1263 | if all_patches: |
|
1263 | if all_patches: | |
1264 | return start |
|
1264 | return start | |
1265 | i = start |
|
1265 | i = start | |
1266 | while i < len(self.series): |
|
1266 | while i < len(self.series): | |
1267 | p, reason = self.pushable(i) |
|
1267 | p, reason = self.pushable(i) | |
1268 | if p: |
|
1268 | if p: | |
1269 | break |
|
1269 | break | |
1270 | self.explain_pushable(i) |
|
1270 | self.explain_pushable(i) | |
1271 | i += 1 |
|
1271 | i += 1 | |
1272 | return i |
|
1272 | return i | |
1273 | if len(self.applied) > 0: |
|
1273 | if len(self.applied) > 0: | |
1274 | p = self.applied[-1].name |
|
1274 | p = self.applied[-1].name | |
1275 | try: |
|
1275 | try: | |
1276 | end = self.series.index(p) |
|
1276 | end = self.series.index(p) | |
1277 | except ValueError: |
|
1277 | except ValueError: | |
1278 | return 0 |
|
1278 | return 0 | |
1279 | return next(end + 1) |
|
1279 | return next(end + 1) | |
1280 | return next(end) |
|
1280 | return next(end) | |
1281 |
|
1281 | |||
1282 | def appliedname(self, index): |
|
1282 | def appliedname(self, index): | |
1283 | pname = self.applied[index].name |
|
1283 | pname = self.applied[index].name | |
1284 | if not self.ui.verbose: |
|
1284 | if not self.ui.verbose: | |
1285 | p = pname |
|
1285 | p = pname | |
1286 | else: |
|
1286 | else: | |
1287 | p = str(self.series.index(pname)) + " " + pname |
|
1287 | p = str(self.series.index(pname)) + " " + pname | |
1288 | return p |
|
1288 | return p | |
1289 |
|
1289 | |||
1290 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, |
|
1290 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, | |
1291 | force=None, git=False): |
|
1291 | force=None, git=False): | |
1292 | def checkseries(patchname): |
|
1292 | def checkseries(patchname): | |
1293 | if patchname in self.series: |
|
1293 | if patchname in self.series: | |
1294 | raise util.Abort(_('patch %s is already in the series file') |
|
1294 | raise util.Abort(_('patch %s is already in the series file') | |
1295 | % patchname) |
|
1295 | % patchname) | |
1296 | def checkfile(patchname): |
|
1296 | def checkfile(patchname): | |
1297 | if not force and os.path.exists(self.join(patchname)): |
|
1297 | if not force and os.path.exists(self.join(patchname)): | |
1298 | raise util.Abort(_('patch "%s" already exists') |
|
1298 | raise util.Abort(_('patch "%s" already exists') | |
1299 | % patchname) |
|
1299 | % patchname) | |
1300 |
|
1300 | |||
1301 | if rev: |
|
1301 | if rev: | |
1302 | if files: |
|
1302 | if files: | |
1303 | raise util.Abort(_('option "-r" not valid when importing ' |
|
1303 | raise util.Abort(_('option "-r" not valid when importing ' | |
1304 | 'files')) |
|
1304 | 'files')) | |
1305 | rev = cmdutil.revrange(repo, rev) |
|
1305 | rev = cmdutil.revrange(repo, rev) | |
1306 | rev.sort(lambda x, y: cmp(y, x)) |
|
1306 | rev.sort(lambda x, y: cmp(y, x)) | |
1307 | if (len(files) > 1 or len(rev) > 1) and patchname: |
|
1307 | if (len(files) > 1 or len(rev) > 1) and patchname: | |
1308 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1308 | raise util.Abort(_('option "-n" not valid when importing multiple ' | |
1309 | 'patches')) |
|
1309 | 'patches')) | |
1310 | i = 0 |
|
1310 | i = 0 | |
1311 | added = [] |
|
1311 | added = [] | |
1312 | if rev: |
|
1312 | if rev: | |
1313 | # If mq patches are applied, we can only import revisions |
|
1313 | # If mq patches are applied, we can only import revisions | |
1314 | # that form a linear path to qbase. |
|
1314 | # that form a linear path to qbase. | |
1315 | # Otherwise, they should form a linear path to a head. |
|
1315 | # Otherwise, they should form a linear path to a head. | |
1316 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) |
|
1316 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) | |
1317 | if len(heads) > 1: |
|
1317 | if len(heads) > 1: | |
1318 | raise util.Abort(_('revision %d is the root of more than one ' |
|
1318 | raise util.Abort(_('revision %d is the root of more than one ' | |
1319 | 'branch') % rev[-1]) |
|
1319 | 'branch') % rev[-1]) | |
1320 | if self.applied: |
|
1320 | if self.applied: | |
1321 | base = revlog.hex(repo.changelog.node(rev[0])) |
|
1321 | base = revlog.hex(repo.changelog.node(rev[0])) | |
1322 | if base in [n.rev for n in self.applied]: |
|
1322 | if base in [n.rev for n in self.applied]: | |
1323 | raise util.Abort(_('revision %d is already managed') |
|
1323 | raise util.Abort(_('revision %d is already managed') | |
1324 | % rev[0]) |
|
1324 | % rev[0]) | |
1325 | if heads != [revlog.bin(self.applied[-1].rev)]: |
|
1325 | if heads != [revlog.bin(self.applied[-1].rev)]: | |
1326 | raise util.Abort(_('revision %d is not the parent of ' |
|
1326 | raise util.Abort(_('revision %d is not the parent of ' | |
1327 | 'the queue') % rev[0]) |
|
1327 | 'the queue') % rev[0]) | |
1328 | base = repo.changelog.rev(revlog.bin(self.applied[0].rev)) |
|
1328 | base = repo.changelog.rev(revlog.bin(self.applied[0].rev)) | |
1329 | lastparent = repo.changelog.parentrevs(base)[0] |
|
1329 | lastparent = repo.changelog.parentrevs(base)[0] | |
1330 | else: |
|
1330 | else: | |
1331 | if heads != [repo.changelog.node(rev[0])]: |
|
1331 | if heads != [repo.changelog.node(rev[0])]: | |
1332 | raise util.Abort(_('revision %d has unmanaged children') |
|
1332 | raise util.Abort(_('revision %d has unmanaged children') | |
1333 | % rev[0]) |
|
1333 | % rev[0]) | |
1334 | lastparent = None |
|
1334 | lastparent = None | |
1335 |
|
1335 | |||
1336 | if git: |
|
1336 | if git: | |
1337 | self.diffopts().git = True |
|
1337 | self.diffopts().git = True | |
1338 |
|
1338 | |||
1339 | for r in rev: |
|
1339 | for r in rev: | |
1340 | p1, p2 = repo.changelog.parentrevs(r) |
|
1340 | p1, p2 = repo.changelog.parentrevs(r) | |
1341 | n = repo.changelog.node(r) |
|
1341 | n = repo.changelog.node(r) | |
1342 | if p2 != revlog.nullrev: |
|
1342 | if p2 != revlog.nullrev: | |
1343 | raise util.Abort(_('cannot import merge revision %d') % r) |
|
1343 | raise util.Abort(_('cannot import merge revision %d') % r) | |
1344 | if lastparent and lastparent != r: |
|
1344 | if lastparent and lastparent != r: | |
1345 | raise util.Abort(_('revision %d is not the parent of %d') |
|
1345 | raise util.Abort(_('revision %d is not the parent of %d') | |
1346 | % (r, lastparent)) |
|
1346 | % (r, lastparent)) | |
1347 | lastparent = p1 |
|
1347 | lastparent = p1 | |
1348 |
|
1348 | |||
1349 | if not patchname: |
|
1349 | if not patchname: | |
1350 | patchname = '%d.diff' % r |
|
1350 | patchname = '%d.diff' % r | |
1351 | checkseries(patchname) |
|
1351 | checkseries(patchname) | |
1352 | checkfile(patchname) |
|
1352 | checkfile(patchname) | |
1353 | self.full_series.insert(0, patchname) |
|
1353 | self.full_series.insert(0, patchname) | |
1354 |
|
1354 | |||
1355 | patchf = self.opener(patchname, "w") |
|
1355 | patchf = self.opener(patchname, "w") | |
1356 | patch.export(repo, [n], fp=patchf, opts=self.diffopts()) |
|
1356 | patch.export(repo, [n], fp=patchf, opts=self.diffopts()) | |
1357 | patchf.close() |
|
1357 | patchf.close() | |
1358 |
|
1358 | |||
1359 | se = statusentry(revlog.hex(n), patchname) |
|
1359 | se = statusentry(revlog.hex(n), patchname) | |
1360 | self.applied.insert(0, se) |
|
1360 | self.applied.insert(0, se) | |
1361 |
|
1361 | |||
1362 | added.append(patchname) |
|
1362 | added.append(patchname) | |
1363 | patchname = None |
|
1363 | patchname = None | |
1364 | self.parse_series() |
|
1364 | self.parse_series() | |
1365 | self.applied_dirty = 1 |
|
1365 | self.applied_dirty = 1 | |
1366 |
|
1366 | |||
1367 | for filename in files: |
|
1367 | for filename in files: | |
1368 | if existing: |
|
1368 | if existing: | |
1369 | if filename == '-': |
|
1369 | if filename == '-': | |
1370 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1370 | raise util.Abort(_('-e is incompatible with import from -')) | |
1371 | if not patchname: |
|
1371 | if not patchname: | |
1372 | patchname = filename |
|
1372 | patchname = filename | |
1373 | if not os.path.isfile(self.join(patchname)): |
|
1373 | if not os.path.isfile(self.join(patchname)): | |
1374 | raise util.Abort(_("patch %s does not exist") % patchname) |
|
1374 | raise util.Abort(_("patch %s does not exist") % patchname) | |
1375 | else: |
|
1375 | else: | |
1376 | try: |
|
1376 | try: | |
1377 | if filename == '-': |
|
1377 | if filename == '-': | |
1378 | if not patchname: |
|
1378 | if not patchname: | |
1379 | raise util.Abort(_('need --name to import a patch from -')) |
|
1379 | raise util.Abort(_('need --name to import a patch from -')) | |
1380 | text = sys.stdin.read() |
|
1380 | text = sys.stdin.read() | |
1381 | else: |
|
1381 | else: | |
1382 | text = file(filename).read() |
|
1382 | text = file(filename).read() | |
1383 | except IOError: |
|
1383 | except IOError: | |
1384 | raise util.Abort(_("unable to read %s") % patchname) |
|
1384 | raise util.Abort(_("unable to read %s") % patchname) | |
1385 | if not patchname: |
|
1385 | if not patchname: | |
1386 | patchname = os.path.basename(filename) |
|
1386 | patchname = os.path.basename(filename) | |
1387 | checkfile(patchname) |
|
1387 | checkfile(patchname) | |
1388 | patchf = self.opener(patchname, "w") |
|
1388 | patchf = self.opener(patchname, "w") | |
1389 | patchf.write(text) |
|
1389 | patchf.write(text) | |
1390 | checkseries(patchname) |
|
1390 | checkseries(patchname) | |
1391 | index = self.full_series_end() + i |
|
1391 | index = self.full_series_end() + i | |
1392 | self.full_series[index:index] = [patchname] |
|
1392 | self.full_series[index:index] = [patchname] | |
1393 | self.parse_series() |
|
1393 | self.parse_series() | |
1394 | self.ui.warn("adding %s to series file\n" % patchname) |
|
1394 | self.ui.warn("adding %s to series file\n" % patchname) | |
1395 | i += 1 |
|
1395 | i += 1 | |
1396 | added.append(patchname) |
|
1396 | added.append(patchname) | |
1397 | patchname = None |
|
1397 | patchname = None | |
1398 | self.series_dirty = 1 |
|
1398 | self.series_dirty = 1 | |
1399 | qrepo = self.qrepo() |
|
1399 | qrepo = self.qrepo() | |
1400 | if qrepo: |
|
1400 | if qrepo: | |
1401 | qrepo.add(added) |
|
1401 | qrepo.add(added) | |
1402 |
|
1402 | |||
1403 | def delete(ui, repo, *patches, **opts): |
|
1403 | def delete(ui, repo, *patches, **opts): | |
1404 | """remove patches from queue |
|
1404 | """remove patches from queue | |
1405 |
|
1405 | |||
1406 | With --rev, mq will stop managing the named revisions. The |
|
1406 | With --rev, mq will stop managing the named revisions. The | |
1407 | patches must be applied and at the base of the stack. This option |
|
1407 | patches must be applied and at the base of the stack. This option | |
1408 | is useful when the patches have been applied upstream. |
|
1408 | is useful when the patches have been applied upstream. | |
1409 |
|
1409 | |||
1410 | Otherwise, the patches must not be applied. |
|
1410 | Otherwise, the patches must not be applied. | |
1411 |
|
1411 | |||
1412 | With --keep, the patch files are preserved in the patch directory.""" |
|
1412 | With --keep, the patch files are preserved in the patch directory.""" | |
1413 | q = repo.mq |
|
1413 | q = repo.mq | |
1414 | q.delete(repo, patches, opts) |
|
1414 | q.delete(repo, patches, opts) | |
1415 | q.save_dirty() |
|
1415 | q.save_dirty() | |
1416 | return 0 |
|
1416 | return 0 | |
1417 |
|
1417 | |||
1418 | def applied(ui, repo, patch=None, **opts): |
|
1418 | def applied(ui, repo, patch=None, **opts): | |
1419 | """print the patches already applied""" |
|
1419 | """print the patches already applied""" | |
1420 | q = repo.mq |
|
1420 | q = repo.mq | |
1421 | if patch: |
|
1421 | if patch: | |
1422 | if patch not in q.series: |
|
1422 | if patch not in q.series: | |
1423 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1423 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1424 | end = q.series.index(patch) + 1 |
|
1424 | end = q.series.index(patch) + 1 | |
1425 | else: |
|
1425 | else: | |
1426 | end = len(q.applied) |
|
1426 | end = len(q.applied) | |
1427 | if not end: |
|
1427 | if not end: | |
1428 | return |
|
1428 | return | |
1429 |
|
1429 | |||
1430 | return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) |
|
1430 | return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) | |
1431 |
|
1431 | |||
1432 | def unapplied(ui, repo, patch=None, **opts): |
|
1432 | def unapplied(ui, repo, patch=None, **opts): | |
1433 | """print the patches not yet applied""" |
|
1433 | """print the patches not yet applied""" | |
1434 | q = repo.mq |
|
1434 | q = repo.mq | |
1435 | if patch: |
|
1435 | if patch: | |
1436 | if patch not in q.series: |
|
1436 | if patch not in q.series: | |
1437 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1437 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1438 | start = q.series.index(patch) + 1 |
|
1438 | start = q.series.index(patch) + 1 | |
1439 | else: |
|
1439 | else: | |
1440 | start = q.series_end() |
|
1440 | start = q.series_end() | |
1441 | q.qseries(repo, start=start, summary=opts.get('summary')) |
|
1441 | q.qseries(repo, start=start, summary=opts.get('summary')) | |
1442 |
|
1442 | |||
1443 | def qimport(ui, repo, *filename, **opts): |
|
1443 | def qimport(ui, repo, *filename, **opts): | |
1444 | """import a patch |
|
1444 | """import a patch | |
1445 |
|
1445 | |||
1446 | The patch will have the same name as its source file unless you |
|
1446 | The patch will have the same name as its source file unless you | |
1447 | give it a new one with --name. |
|
1447 | give it a new one with --name. | |
1448 |
|
1448 | |||
1449 | You can register an existing patch inside the patch directory |
|
1449 | You can register an existing patch inside the patch directory | |
1450 | with the --existing flag. |
|
1450 | with the --existing flag. | |
1451 |
|
1451 | |||
1452 | With --force, an existing patch of the same name will be overwritten. |
|
1452 | With --force, an existing patch of the same name will be overwritten. | |
1453 |
|
1453 | |||
1454 | An existing changeset may be placed under mq control with --rev |
|
1454 | An existing changeset may be placed under mq control with --rev | |
1455 | (e.g. qimport --rev tip -n patch will place tip under mq control). |
|
1455 | (e.g. qimport --rev tip -n patch will place tip under mq control). | |
1456 | With --git, patches imported with --rev will use the git diff |
|
1456 | With --git, patches imported with --rev will use the git diff | |
1457 | format. |
|
1457 | format. | |
1458 | """ |
|
1458 | """ | |
1459 | q = repo.mq |
|
1459 | q = repo.mq | |
1460 | q.qimport(repo, filename, patchname=opts['name'], |
|
1460 | q.qimport(repo, filename, patchname=opts['name'], | |
1461 | existing=opts['existing'], force=opts['force'], rev=opts['rev'], |
|
1461 | existing=opts['existing'], force=opts['force'], rev=opts['rev'], | |
1462 | git=opts['git']) |
|
1462 | git=opts['git']) | |
1463 | q.save_dirty() |
|
1463 | q.save_dirty() | |
1464 | return 0 |
|
1464 | return 0 | |
1465 |
|
1465 | |||
1466 | def init(ui, repo, **opts): |
|
1466 | def init(ui, repo, **opts): | |
1467 | """init a new queue repository |
|
1467 | """init a new queue repository | |
1468 |
|
1468 | |||
1469 | The queue repository is unversioned by default. If -c is |
|
1469 | The queue repository is unversioned by default. If -c is | |
1470 | specified, qinit will create a separate nested repository |
|
1470 | specified, qinit will create a separate nested repository | |
1471 | for patches. Use qcommit to commit changes to this queue |
|
1471 | for patches. Use qcommit to commit changes to this queue | |
1472 | repository.""" |
|
1472 | repository.""" | |
1473 | q = repo.mq |
|
1473 | q = repo.mq | |
1474 | r = q.init(repo, create=opts['create_repo']) |
|
1474 | r = q.init(repo, create=opts['create_repo']) | |
1475 | q.save_dirty() |
|
1475 | q.save_dirty() | |
1476 | if r: |
|
1476 | if r: | |
1477 | fp = r.wopener('.hgignore', 'w') |
|
1477 | fp = r.wopener('.hgignore', 'w') | |
1478 | print >> fp, 'syntax: glob' |
|
1478 | print >> fp, 'syntax: glob' | |
1479 | print >> fp, 'status' |
|
1479 | print >> fp, 'status' | |
1480 | print >> fp, 'guards' |
|
1480 | print >> fp, 'guards' | |
1481 | fp.close() |
|
1481 | fp.close() | |
1482 | r.wopener('series', 'w').close() |
|
1482 | r.wopener('series', 'w').close() | |
1483 | r.add(['.hgignore', 'series']) |
|
1483 | r.add(['.hgignore', 'series']) | |
1484 | return 0 |
|
1484 | return 0 | |
1485 |
|
1485 | |||
1486 | def clone(ui, source, dest=None, **opts): |
|
1486 | def clone(ui, source, dest=None, **opts): | |
1487 | '''clone main and patch repository at same time |
|
1487 | '''clone main and patch repository at same time | |
1488 |
|
1488 | |||
1489 | If source is local, destination will have no patches applied. If |
|
1489 | If source is local, destination will have no patches applied. If | |
1490 | source is remote, this command can not check if patches are |
|
1490 | source is remote, this command can not check if patches are | |
1491 | applied in source, so cannot guarantee that patches are not |
|
1491 | applied in source, so cannot guarantee that patches are not | |
1492 | applied in destination. If you clone remote repository, be sure |
|
1492 | applied in destination. If you clone remote repository, be sure | |
1493 | before that it has no patches applied. |
|
1493 | before that it has no patches applied. | |
1494 |
|
1494 | |||
1495 | Source patch repository is looked for in <src>/.hg/patches by |
|
1495 | Source patch repository is looked for in <src>/.hg/patches by | |
1496 | default. Use -p <url> to change. |
|
1496 | default. Use -p <url> to change. | |
1497 | ''' |
|
1497 | ''' | |
1498 | commands.setremoteconfig(ui, opts) |
|
1498 | commands.setremoteconfig(ui, opts) | |
1499 | if dest is None: |
|
1499 | if dest is None: | |
1500 | dest = hg.defaultdest(source) |
|
1500 | dest = hg.defaultdest(source) | |
1501 | sr = hg.repository(ui, ui.expandpath(source)) |
|
1501 | sr = hg.repository(ui, ui.expandpath(source)) | |
1502 | qbase, destrev = None, None |
|
1502 | qbase, destrev = None, None | |
1503 | if sr.local(): |
|
1503 | if sr.local(): | |
1504 | reposetup(ui, sr) |
|
|||
1505 | if sr.mq.applied: |
|
1504 | if sr.mq.applied: | |
1506 | qbase = revlog.bin(sr.mq.applied[0].rev) |
|
1505 | qbase = revlog.bin(sr.mq.applied[0].rev) | |
1507 | if not hg.islocal(dest): |
|
1506 | if not hg.islocal(dest): | |
1508 | destrev = sr.parents(qbase)[0] |
|
1507 | destrev = sr.parents(qbase)[0] | |
1509 | ui.note(_('cloning main repo\n')) |
|
1508 | ui.note(_('cloning main repo\n')) | |
1510 | sr, dr = hg.clone(ui, sr, dest, |
|
1509 | sr, dr = hg.clone(ui, sr, dest, | |
1511 | pull=opts['pull'], |
|
1510 | pull=opts['pull'], | |
1512 | rev=destrev, |
|
1511 | rev=destrev, | |
1513 | update=False, |
|
1512 | update=False, | |
1514 | stream=opts['uncompressed']) |
|
1513 | stream=opts['uncompressed']) | |
1515 | ui.note(_('cloning patch repo\n')) |
|
1514 | ui.note(_('cloning patch repo\n')) | |
1516 | spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), |
|
1515 | spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), | |
1517 | dr.url() + '/.hg/patches', |
|
1516 | dr.url() + '/.hg/patches', | |
1518 | pull=opts['pull'], |
|
1517 | pull=opts['pull'], | |
1519 | update=not opts['noupdate'], |
|
1518 | update=not opts['noupdate'], | |
1520 | stream=opts['uncompressed']) |
|
1519 | stream=opts['uncompressed']) | |
1521 | if dr.local(): |
|
1520 | if dr.local(): | |
1522 | if qbase: |
|
1521 | if qbase: | |
1523 | ui.note(_('stripping applied patches from destination repo\n')) |
|
1522 | ui.note(_('stripping applied patches from destination repo\n')) | |
1524 | reposetup(ui, dr) |
|
|||
1525 | dr.mq.strip(dr, qbase, update=False, backup=None) |
|
1523 | dr.mq.strip(dr, qbase, update=False, backup=None) | |
1526 | if not opts['noupdate']: |
|
1524 | if not opts['noupdate']: | |
1527 | ui.note(_('updating destination repo\n')) |
|
1525 | ui.note(_('updating destination repo\n')) | |
1528 | hg.update(dr, dr.changelog.tip()) |
|
1526 | hg.update(dr, dr.changelog.tip()) | |
1529 |
|
1527 | |||
1530 | def commit(ui, repo, *pats, **opts): |
|
1528 | def commit(ui, repo, *pats, **opts): | |
1531 | """commit changes in the queue repository""" |
|
1529 | """commit changes in the queue repository""" | |
1532 | q = repo.mq |
|
1530 | q = repo.mq | |
1533 | r = q.qrepo() |
|
1531 | r = q.qrepo() | |
1534 | if not r: raise util.Abort('no queue repository') |
|
1532 | if not r: raise util.Abort('no queue repository') | |
1535 | commands.commit(r.ui, r, *pats, **opts) |
|
1533 | commands.commit(r.ui, r, *pats, **opts) | |
1536 |
|
1534 | |||
1537 | def series(ui, repo, **opts): |
|
1535 | def series(ui, repo, **opts): | |
1538 | """print the entire series file""" |
|
1536 | """print the entire series file""" | |
1539 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
|
1537 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) | |
1540 | return 0 |
|
1538 | return 0 | |
1541 |
|
1539 | |||
1542 | def top(ui, repo, **opts): |
|
1540 | def top(ui, repo, **opts): | |
1543 | """print the name of the current patch""" |
|
1541 | """print the name of the current patch""" | |
1544 | q = repo.mq |
|
1542 | q = repo.mq | |
1545 | t = len(q.applied) |
|
1543 | t = len(q.applied) | |
1546 | if t: |
|
1544 | if t: | |
1547 | return q.qseries(repo, start=t-1, length=1, status='A', |
|
1545 | return q.qseries(repo, start=t-1, length=1, status='A', | |
1548 | summary=opts.get('summary')) |
|
1546 | summary=opts.get('summary')) | |
1549 | else: |
|
1547 | else: | |
1550 | ui.write("No patches applied\n") |
|
1548 | ui.write("No patches applied\n") | |
1551 | return 1 |
|
1549 | return 1 | |
1552 |
|
1550 | |||
1553 | def next(ui, repo, **opts): |
|
1551 | def next(ui, repo, **opts): | |
1554 | """print the name of the next patch""" |
|
1552 | """print the name of the next patch""" | |
1555 | q = repo.mq |
|
1553 | q = repo.mq | |
1556 | end = q.series_end() |
|
1554 | end = q.series_end() | |
1557 | if end == len(q.series): |
|
1555 | if end == len(q.series): | |
1558 | ui.write("All patches applied\n") |
|
1556 | ui.write("All patches applied\n") | |
1559 | return 1 |
|
1557 | return 1 | |
1560 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
1558 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) | |
1561 |
|
1559 | |||
1562 | def prev(ui, repo, **opts): |
|
1560 | def prev(ui, repo, **opts): | |
1563 | """print the name of the previous patch""" |
|
1561 | """print the name of the previous patch""" | |
1564 | q = repo.mq |
|
1562 | q = repo.mq | |
1565 | l = len(q.applied) |
|
1563 | l = len(q.applied) | |
1566 | if l == 1: |
|
1564 | if l == 1: | |
1567 | ui.write("Only one patch applied\n") |
|
1565 | ui.write("Only one patch applied\n") | |
1568 | return 1 |
|
1566 | return 1 | |
1569 | if not l: |
|
1567 | if not l: | |
1570 | ui.write("No patches applied\n") |
|
1568 | ui.write("No patches applied\n") | |
1571 | return 1 |
|
1569 | return 1 | |
1572 | return q.qseries(repo, start=l-2, length=1, status='A', |
|
1570 | return q.qseries(repo, start=l-2, length=1, status='A', | |
1573 | summary=opts.get('summary')) |
|
1571 | summary=opts.get('summary')) | |
1574 |
|
1572 | |||
1575 | def new(ui, repo, patch, **opts): |
|
1573 | def new(ui, repo, patch, **opts): | |
1576 | """create a new patch |
|
1574 | """create a new patch | |
1577 |
|
1575 | |||
1578 | qnew creates a new patch on top of the currently-applied patch |
|
1576 | qnew creates a new patch on top of the currently-applied patch | |
1579 | (if any). It will refuse to run if there are any outstanding |
|
1577 | (if any). It will refuse to run if there are any outstanding | |
1580 | changes unless -f is specified, in which case the patch will |
|
1578 | changes unless -f is specified, in which case the patch will | |
1581 | be initialised with them. |
|
1579 | be initialised with them. | |
1582 |
|
1580 | |||
1583 | -e, -m or -l set the patch header as well as the commit message. |
|
1581 | -e, -m or -l set the patch header as well as the commit message. | |
1584 | If none is specified, the patch header is empty and the |
|
1582 | If none is specified, the patch header is empty and the | |
1585 | commit message is 'New patch: PATCH'""" |
|
1583 | commit message is 'New patch: PATCH'""" | |
1586 | q = repo.mq |
|
1584 | q = repo.mq | |
1587 | message = commands.logmessage(opts) |
|
1585 | message = commands.logmessage(opts) | |
1588 | if opts['edit']: |
|
1586 | if opts['edit']: | |
1589 | message = ui.edit(message, ui.username()) |
|
1587 | message = ui.edit(message, ui.username()) | |
1590 | q.new(repo, patch, msg=message, force=opts['force']) |
|
1588 | q.new(repo, patch, msg=message, force=opts['force']) | |
1591 | q.save_dirty() |
|
1589 | q.save_dirty() | |
1592 | return 0 |
|
1590 | return 0 | |
1593 |
|
1591 | |||
1594 | def refresh(ui, repo, *pats, **opts): |
|
1592 | def refresh(ui, repo, *pats, **opts): | |
1595 | """update the current patch |
|
1593 | """update the current patch | |
1596 |
|
1594 | |||
1597 | If any file patterns are provided, the refreshed patch will contain only |
|
1595 | If any file patterns are provided, the refreshed patch will contain only | |
1598 | the modifications that match those patterns; the remaining modifications |
|
1596 | the modifications that match those patterns; the remaining modifications | |
1599 | will remain in the working directory. |
|
1597 | will remain in the working directory. | |
1600 | """ |
|
1598 | """ | |
1601 | q = repo.mq |
|
1599 | q = repo.mq | |
1602 | message = commands.logmessage(opts) |
|
1600 | message = commands.logmessage(opts) | |
1603 | if opts['edit']: |
|
1601 | if opts['edit']: | |
1604 | if message: |
|
1602 | if message: | |
1605 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1603 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
1606 | patch = q.applied[-1].name |
|
1604 | patch = q.applied[-1].name | |
1607 | (message, comment, user, date, hasdiff) = q.readheaders(patch) |
|
1605 | (message, comment, user, date, hasdiff) = q.readheaders(patch) | |
1608 | message = ui.edit('\n'.join(message), user or ui.username()) |
|
1606 | message = ui.edit('\n'.join(message), user or ui.username()) | |
1609 | ret = q.refresh(repo, pats, msg=message, **opts) |
|
1607 | ret = q.refresh(repo, pats, msg=message, **opts) | |
1610 | q.save_dirty() |
|
1608 | q.save_dirty() | |
1611 | return ret |
|
1609 | return ret | |
1612 |
|
1610 | |||
1613 | def diff(ui, repo, *pats, **opts): |
|
1611 | def diff(ui, repo, *pats, **opts): | |
1614 | """diff of the current patch""" |
|
1612 | """diff of the current patch""" | |
1615 | repo.mq.diff(repo, pats, opts) |
|
1613 | repo.mq.diff(repo, pats, opts) | |
1616 | return 0 |
|
1614 | return 0 | |
1617 |
|
1615 | |||
1618 | def fold(ui, repo, *files, **opts): |
|
1616 | def fold(ui, repo, *files, **opts): | |
1619 | """fold the named patches into the current patch |
|
1617 | """fold the named patches into the current patch | |
1620 |
|
1618 | |||
1621 | Patches must not yet be applied. Each patch will be successively |
|
1619 | Patches must not yet be applied. Each patch will be successively | |
1622 | applied to the current patch in the order given. If all the |
|
1620 | applied to the current patch in the order given. If all the | |
1623 | patches apply successfully, the current patch will be refreshed |
|
1621 | patches apply successfully, the current patch will be refreshed | |
1624 | with the new cumulative patch, and the folded patches will |
|
1622 | with the new cumulative patch, and the folded patches will | |
1625 | be deleted. With -k/--keep, the folded patch files will not |
|
1623 | be deleted. With -k/--keep, the folded patch files will not | |
1626 | be removed afterwards. |
|
1624 | be removed afterwards. | |
1627 |
|
1625 | |||
1628 | The header for each folded patch will be concatenated with |
|
1626 | The header for each folded patch will be concatenated with | |
1629 | the current patch header, separated by a line of '* * *'.""" |
|
1627 | the current patch header, separated by a line of '* * *'.""" | |
1630 |
|
1628 | |||
1631 | q = repo.mq |
|
1629 | q = repo.mq | |
1632 |
|
1630 | |||
1633 | if not files: |
|
1631 | if not files: | |
1634 | raise util.Abort(_('qfold requires at least one patch name')) |
|
1632 | raise util.Abort(_('qfold requires at least one patch name')) | |
1635 | if not q.check_toppatch(repo): |
|
1633 | if not q.check_toppatch(repo): | |
1636 | raise util.Abort(_('No patches applied')) |
|
1634 | raise util.Abort(_('No patches applied')) | |
1637 |
|
1635 | |||
1638 | message = commands.logmessage(opts) |
|
1636 | message = commands.logmessage(opts) | |
1639 | if opts['edit']: |
|
1637 | if opts['edit']: | |
1640 | if message: |
|
1638 | if message: | |
1641 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1639 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
1642 |
|
1640 | |||
1643 | parent = q.lookup('qtip') |
|
1641 | parent = q.lookup('qtip') | |
1644 | patches = [] |
|
1642 | patches = [] | |
1645 | messages = [] |
|
1643 | messages = [] | |
1646 | for f in files: |
|
1644 | for f in files: | |
1647 | p = q.lookup(f) |
|
1645 | p = q.lookup(f) | |
1648 | if p in patches or p == parent: |
|
1646 | if p in patches or p == parent: | |
1649 | ui.warn(_('Skipping already folded patch %s') % p) |
|
1647 | ui.warn(_('Skipping already folded patch %s') % p) | |
1650 | if q.isapplied(p): |
|
1648 | if q.isapplied(p): | |
1651 | raise util.Abort(_('qfold cannot fold already applied patch %s') % p) |
|
1649 | raise util.Abort(_('qfold cannot fold already applied patch %s') % p) | |
1652 | patches.append(p) |
|
1650 | patches.append(p) | |
1653 |
|
1651 | |||
1654 | for p in patches: |
|
1652 | for p in patches: | |
1655 | if not message: |
|
1653 | if not message: | |
1656 | messages.append(q.readheaders(p)[0]) |
|
1654 | messages.append(q.readheaders(p)[0]) | |
1657 | pf = q.join(p) |
|
1655 | pf = q.join(p) | |
1658 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
1656 | (patchsuccess, files, fuzz) = q.patch(repo, pf) | |
1659 | if not patchsuccess: |
|
1657 | if not patchsuccess: | |
1660 | raise util.Abort(_('Error folding patch %s') % p) |
|
1658 | raise util.Abort(_('Error folding patch %s') % p) | |
1661 | patch.updatedir(ui, repo, files) |
|
1659 | patch.updatedir(ui, repo, files) | |
1662 |
|
1660 | |||
1663 | if not message: |
|
1661 | if not message: | |
1664 | message, comments, user = q.readheaders(parent)[0:3] |
|
1662 | message, comments, user = q.readheaders(parent)[0:3] | |
1665 | for msg in messages: |
|
1663 | for msg in messages: | |
1666 | message.append('* * *') |
|
1664 | message.append('* * *') | |
1667 | message.extend(msg) |
|
1665 | message.extend(msg) | |
1668 | message = '\n'.join(message) |
|
1666 | message = '\n'.join(message) | |
1669 |
|
1667 | |||
1670 | if opts['edit']: |
|
1668 | if opts['edit']: | |
1671 | message = ui.edit(message, user or ui.username()) |
|
1669 | message = ui.edit(message, user or ui.username()) | |
1672 |
|
1670 | |||
1673 | q.refresh(repo, msg=message) |
|
1671 | q.refresh(repo, msg=message) | |
1674 | q.delete(repo, patches, opts) |
|
1672 | q.delete(repo, patches, opts) | |
1675 | q.save_dirty() |
|
1673 | q.save_dirty() | |
1676 |
|
1674 | |||
1677 | def guard(ui, repo, *args, **opts): |
|
1675 | def guard(ui, repo, *args, **opts): | |
1678 | '''set or print guards for a patch |
|
1676 | '''set or print guards for a patch | |
1679 |
|
1677 | |||
1680 | Guards control whether a patch can be pushed. A patch with no |
|
1678 | Guards control whether a patch can be pushed. A patch with no | |
1681 | guards is always pushed. A patch with a positive guard ("+foo") is |
|
1679 | guards is always pushed. A patch with a positive guard ("+foo") is | |
1682 | pushed only if the qselect command has activated it. A patch with |
|
1680 | pushed only if the qselect command has activated it. A patch with | |
1683 | a negative guard ("-foo") is never pushed if the qselect command |
|
1681 | a negative guard ("-foo") is never pushed if the qselect command | |
1684 | has activated it. |
|
1682 | has activated it. | |
1685 |
|
1683 | |||
1686 | With no arguments, print the currently active guards. |
|
1684 | With no arguments, print the currently active guards. | |
1687 | With arguments, set guards for the named patch. |
|
1685 | With arguments, set guards for the named patch. | |
1688 |
|
1686 | |||
1689 | To set a negative guard "-foo" on topmost patch ("--" is needed so |
|
1687 | To set a negative guard "-foo" on topmost patch ("--" is needed so | |
1690 | hg will not interpret "-foo" as an option): |
|
1688 | hg will not interpret "-foo" as an option): | |
1691 | hg qguard -- -foo |
|
1689 | hg qguard -- -foo | |
1692 |
|
1690 | |||
1693 | To set guards on another patch: |
|
1691 | To set guards on another patch: | |
1694 | hg qguard other.patch +2.6.17 -stable |
|
1692 | hg qguard other.patch +2.6.17 -stable | |
1695 | ''' |
|
1693 | ''' | |
1696 | def status(idx): |
|
1694 | def status(idx): | |
1697 | guards = q.series_guards[idx] or ['unguarded'] |
|
1695 | guards = q.series_guards[idx] or ['unguarded'] | |
1698 | ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards))) |
|
1696 | ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards))) | |
1699 | q = repo.mq |
|
1697 | q = repo.mq | |
1700 | patch = None |
|
1698 | patch = None | |
1701 | args = list(args) |
|
1699 | args = list(args) | |
1702 | if opts['list']: |
|
1700 | if opts['list']: | |
1703 | if args or opts['none']: |
|
1701 | if args or opts['none']: | |
1704 | raise util.Abort(_('cannot mix -l/--list with options or arguments')) |
|
1702 | raise util.Abort(_('cannot mix -l/--list with options or arguments')) | |
1705 | for i in xrange(len(q.series)): |
|
1703 | for i in xrange(len(q.series)): | |
1706 | status(i) |
|
1704 | status(i) | |
1707 | return |
|
1705 | return | |
1708 | if not args or args[0][0:1] in '-+': |
|
1706 | if not args or args[0][0:1] in '-+': | |
1709 | if not q.applied: |
|
1707 | if not q.applied: | |
1710 | raise util.Abort(_('no patches applied')) |
|
1708 | raise util.Abort(_('no patches applied')) | |
1711 | patch = q.applied[-1].name |
|
1709 | patch = q.applied[-1].name | |
1712 | if patch is None and args[0][0:1] not in '-+': |
|
1710 | if patch is None and args[0][0:1] not in '-+': | |
1713 | patch = args.pop(0) |
|
1711 | patch = args.pop(0) | |
1714 | if patch is None: |
|
1712 | if patch is None: | |
1715 | raise util.Abort(_('no patch to work with')) |
|
1713 | raise util.Abort(_('no patch to work with')) | |
1716 | if args or opts['none']: |
|
1714 | if args or opts['none']: | |
1717 | q.set_guards(q.find_series(patch), args) |
|
1715 | q.set_guards(q.find_series(patch), args) | |
1718 | q.save_dirty() |
|
1716 | q.save_dirty() | |
1719 | else: |
|
1717 | else: | |
1720 | status(q.series.index(q.lookup(patch))) |
|
1718 | status(q.series.index(q.lookup(patch))) | |
1721 |
|
1719 | |||
1722 | def header(ui, repo, patch=None): |
|
1720 | def header(ui, repo, patch=None): | |
1723 | """Print the header of the topmost or specified patch""" |
|
1721 | """Print the header of the topmost or specified patch""" | |
1724 | q = repo.mq |
|
1722 | q = repo.mq | |
1725 |
|
1723 | |||
1726 | if patch: |
|
1724 | if patch: | |
1727 | patch = q.lookup(patch) |
|
1725 | patch = q.lookup(patch) | |
1728 | else: |
|
1726 | else: | |
1729 | if not q.applied: |
|
1727 | if not q.applied: | |
1730 | ui.write('No patches applied\n') |
|
1728 | ui.write('No patches applied\n') | |
1731 | return 1 |
|
1729 | return 1 | |
1732 | patch = q.lookup('qtip') |
|
1730 | patch = q.lookup('qtip') | |
1733 | message = repo.mq.readheaders(patch)[0] |
|
1731 | message = repo.mq.readheaders(patch)[0] | |
1734 |
|
1732 | |||
1735 | ui.write('\n'.join(message) + '\n') |
|
1733 | ui.write('\n'.join(message) + '\n') | |
1736 |
|
1734 | |||
1737 | def lastsavename(path): |
|
1735 | def lastsavename(path): | |
1738 | (directory, base) = os.path.split(path) |
|
1736 | (directory, base) = os.path.split(path) | |
1739 | names = os.listdir(directory) |
|
1737 | names = os.listdir(directory) | |
1740 | namere = re.compile("%s.([0-9]+)" % base) |
|
1738 | namere = re.compile("%s.([0-9]+)" % base) | |
1741 | maxindex = None |
|
1739 | maxindex = None | |
1742 | maxname = None |
|
1740 | maxname = None | |
1743 | for f in names: |
|
1741 | for f in names: | |
1744 | m = namere.match(f) |
|
1742 | m = namere.match(f) | |
1745 | if m: |
|
1743 | if m: | |
1746 | index = int(m.group(1)) |
|
1744 | index = int(m.group(1)) | |
1747 | if maxindex == None or index > maxindex: |
|
1745 | if maxindex == None or index > maxindex: | |
1748 | maxindex = index |
|
1746 | maxindex = index | |
1749 | maxname = f |
|
1747 | maxname = f | |
1750 | if maxname: |
|
1748 | if maxname: | |
1751 | return (os.path.join(directory, maxname), maxindex) |
|
1749 | return (os.path.join(directory, maxname), maxindex) | |
1752 | return (None, None) |
|
1750 | return (None, None) | |
1753 |
|
1751 | |||
1754 | def savename(path): |
|
1752 | def savename(path): | |
1755 | (last, index) = lastsavename(path) |
|
1753 | (last, index) = lastsavename(path) | |
1756 | if last is None: |
|
1754 | if last is None: | |
1757 | index = 0 |
|
1755 | index = 0 | |
1758 | newpath = path + ".%d" % (index + 1) |
|
1756 | newpath = path + ".%d" % (index + 1) | |
1759 | return newpath |
|
1757 | return newpath | |
1760 |
|
1758 | |||
1761 | def push(ui, repo, patch=None, **opts): |
|
1759 | def push(ui, repo, patch=None, **opts): | |
1762 | """push the next patch onto the stack""" |
|
1760 | """push the next patch onto the stack""" | |
1763 | q = repo.mq |
|
1761 | q = repo.mq | |
1764 | mergeq = None |
|
1762 | mergeq = None | |
1765 |
|
1763 | |||
1766 | if opts['all']: |
|
1764 | if opts['all']: | |
1767 | if not q.series: |
|
1765 | if not q.series: | |
1768 | raise util.Abort(_('no patches in series')) |
|
1766 | raise util.Abort(_('no patches in series')) | |
1769 | patch = q.series[-1] |
|
1767 | patch = q.series[-1] | |
1770 | if opts['merge']: |
|
1768 | if opts['merge']: | |
1771 | if opts['name']: |
|
1769 | if opts['name']: | |
1772 | newpath = opts['name'] |
|
1770 | newpath = opts['name'] | |
1773 | else: |
|
1771 | else: | |
1774 | newpath, i = lastsavename(q.path) |
|
1772 | newpath, i = lastsavename(q.path) | |
1775 | if not newpath: |
|
1773 | if not newpath: | |
1776 | ui.warn("no saved queues found, please use -n\n") |
|
1774 | ui.warn("no saved queues found, please use -n\n") | |
1777 | return 1 |
|
1775 | return 1 | |
1778 | mergeq = queue(ui, repo.join(""), newpath) |
|
1776 | mergeq = queue(ui, repo.join(""), newpath) | |
1779 | ui.warn("merging with queue at: %s\n" % mergeq.path) |
|
1777 | ui.warn("merging with queue at: %s\n" % mergeq.path) | |
1780 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
|
1778 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], | |
1781 | mergeq=mergeq) |
|
1779 | mergeq=mergeq) | |
1782 | q.save_dirty() |
|
1780 | q.save_dirty() | |
1783 | return ret |
|
1781 | return ret | |
1784 |
|
1782 | |||
1785 | def pop(ui, repo, patch=None, **opts): |
|
1783 | def pop(ui, repo, patch=None, **opts): | |
1786 | """pop the current patch off the stack""" |
|
1784 | """pop the current patch off the stack""" | |
1787 | localupdate = True |
|
1785 | localupdate = True | |
1788 | if opts['name']: |
|
1786 | if opts['name']: | |
1789 | q = queue(ui, repo.join(""), repo.join(opts['name'])) |
|
1787 | q = queue(ui, repo.join(""), repo.join(opts['name'])) | |
1790 | ui.warn('using patch queue: %s\n' % q.path) |
|
1788 | ui.warn('using patch queue: %s\n' % q.path) | |
1791 | localupdate = False |
|
1789 | localupdate = False | |
1792 | else: |
|
1790 | else: | |
1793 | q = repo.mq |
|
1791 | q = repo.mq | |
1794 | q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
|
1792 | q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) | |
1795 | q.save_dirty() |
|
1793 | q.save_dirty() | |
1796 | return 0 |
|
1794 | return 0 | |
1797 |
|
1795 | |||
1798 | def rename(ui, repo, patch, name=None, **opts): |
|
1796 | def rename(ui, repo, patch, name=None, **opts): | |
1799 | """rename a patch |
|
1797 | """rename a patch | |
1800 |
|
1798 | |||
1801 | With one argument, renames the current patch to PATCH1. |
|
1799 | With one argument, renames the current patch to PATCH1. | |
1802 | With two arguments, renames PATCH1 to PATCH2.""" |
|
1800 | With two arguments, renames PATCH1 to PATCH2.""" | |
1803 |
|
1801 | |||
1804 | q = repo.mq |
|
1802 | q = repo.mq | |
1805 |
|
1803 | |||
1806 | if not name: |
|
1804 | if not name: | |
1807 | name = patch |
|
1805 | name = patch | |
1808 | patch = None |
|
1806 | patch = None | |
1809 |
|
1807 | |||
1810 | if patch: |
|
1808 | if patch: | |
1811 | patch = q.lookup(patch) |
|
1809 | patch = q.lookup(patch) | |
1812 | else: |
|
1810 | else: | |
1813 | if not q.applied: |
|
1811 | if not q.applied: | |
1814 | ui.write(_('No patches applied\n')) |
|
1812 | ui.write(_('No patches applied\n')) | |
1815 | return |
|
1813 | return | |
1816 | patch = q.lookup('qtip') |
|
1814 | patch = q.lookup('qtip') | |
1817 | absdest = q.join(name) |
|
1815 | absdest = q.join(name) | |
1818 | if os.path.isdir(absdest): |
|
1816 | if os.path.isdir(absdest): | |
1819 | name = os.path.join(name, os.path.basename(patch)) |
|
1817 | name = os.path.join(name, os.path.basename(patch)) | |
1820 | absdest = q.join(name) |
|
1818 | absdest = q.join(name) | |
1821 | if os.path.exists(absdest): |
|
1819 | if os.path.exists(absdest): | |
1822 | raise util.Abort(_('%s already exists') % absdest) |
|
1820 | raise util.Abort(_('%s already exists') % absdest) | |
1823 |
|
1821 | |||
1824 | if name in q.series: |
|
1822 | if name in q.series: | |
1825 | raise util.Abort(_('A patch named %s already exists in the series file') % name) |
|
1823 | raise util.Abort(_('A patch named %s already exists in the series file') % name) | |
1826 |
|
1824 | |||
1827 | if ui.verbose: |
|
1825 | if ui.verbose: | |
1828 | ui.write('Renaming %s to %s\n' % (patch, name)) |
|
1826 | ui.write('Renaming %s to %s\n' % (patch, name)) | |
1829 | i = q.find_series(patch) |
|
1827 | i = q.find_series(patch) | |
1830 | guards = q.guard_re.findall(q.full_series[i]) |
|
1828 | guards = q.guard_re.findall(q.full_series[i]) | |
1831 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
|
1829 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) | |
1832 | q.parse_series() |
|
1830 | q.parse_series() | |
1833 | q.series_dirty = 1 |
|
1831 | q.series_dirty = 1 | |
1834 |
|
1832 | |||
1835 | info = q.isapplied(patch) |
|
1833 | info = q.isapplied(patch) | |
1836 | if info: |
|
1834 | if info: | |
1837 | q.applied[info[0]] = statusentry(info[1], name) |
|
1835 | q.applied[info[0]] = statusentry(info[1], name) | |
1838 | q.applied_dirty = 1 |
|
1836 | q.applied_dirty = 1 | |
1839 |
|
1837 | |||
1840 | util.rename(q.join(patch), absdest) |
|
1838 | util.rename(q.join(patch), absdest) | |
1841 | r = q.qrepo() |
|
1839 | r = q.qrepo() | |
1842 | if r: |
|
1840 | if r: | |
1843 | wlock = r.wlock() |
|
1841 | wlock = r.wlock() | |
1844 | if r.dirstate.state(name) == 'r': |
|
1842 | if r.dirstate.state(name) == 'r': | |
1845 | r.undelete([name], wlock) |
|
1843 | r.undelete([name], wlock) | |
1846 | r.copy(patch, name, wlock) |
|
1844 | r.copy(patch, name, wlock) | |
1847 | r.remove([patch], False, wlock) |
|
1845 | r.remove([patch], False, wlock) | |
1848 |
|
1846 | |||
1849 | q.save_dirty() |
|
1847 | q.save_dirty() | |
1850 |
|
1848 | |||
1851 | def restore(ui, repo, rev, **opts): |
|
1849 | def restore(ui, repo, rev, **opts): | |
1852 | """restore the queue state saved by a rev""" |
|
1850 | """restore the queue state saved by a rev""" | |
1853 | rev = repo.lookup(rev) |
|
1851 | rev = repo.lookup(rev) | |
1854 | q = repo.mq |
|
1852 | q = repo.mq | |
1855 | q.restore(repo, rev, delete=opts['delete'], |
|
1853 | q.restore(repo, rev, delete=opts['delete'], | |
1856 | qupdate=opts['update']) |
|
1854 | qupdate=opts['update']) | |
1857 | q.save_dirty() |
|
1855 | q.save_dirty() | |
1858 | return 0 |
|
1856 | return 0 | |
1859 |
|
1857 | |||
1860 | def save(ui, repo, **opts): |
|
1858 | def save(ui, repo, **opts): | |
1861 | """save current queue state""" |
|
1859 | """save current queue state""" | |
1862 | q = repo.mq |
|
1860 | q = repo.mq | |
1863 | message = commands.logmessage(opts) |
|
1861 | message = commands.logmessage(opts) | |
1864 | ret = q.save(repo, msg=message) |
|
1862 | ret = q.save(repo, msg=message) | |
1865 | if ret: |
|
1863 | if ret: | |
1866 | return ret |
|
1864 | return ret | |
1867 | q.save_dirty() |
|
1865 | q.save_dirty() | |
1868 | if opts['copy']: |
|
1866 | if opts['copy']: | |
1869 | path = q.path |
|
1867 | path = q.path | |
1870 | if opts['name']: |
|
1868 | if opts['name']: | |
1871 | newpath = os.path.join(q.basepath, opts['name']) |
|
1869 | newpath = os.path.join(q.basepath, opts['name']) | |
1872 | if os.path.exists(newpath): |
|
1870 | if os.path.exists(newpath): | |
1873 | if not os.path.isdir(newpath): |
|
1871 | if not os.path.isdir(newpath): | |
1874 | raise util.Abort(_('destination %s exists and is not ' |
|
1872 | raise util.Abort(_('destination %s exists and is not ' | |
1875 | 'a directory') % newpath) |
|
1873 | 'a directory') % newpath) | |
1876 | if not opts['force']: |
|
1874 | if not opts['force']: | |
1877 | raise util.Abort(_('destination %s exists, ' |
|
1875 | raise util.Abort(_('destination %s exists, ' | |
1878 | 'use -f to force') % newpath) |
|
1876 | 'use -f to force') % newpath) | |
1879 | else: |
|
1877 | else: | |
1880 | newpath = savename(path) |
|
1878 | newpath = savename(path) | |
1881 | ui.warn("copy %s to %s\n" % (path, newpath)) |
|
1879 | ui.warn("copy %s to %s\n" % (path, newpath)) | |
1882 | util.copyfiles(path, newpath) |
|
1880 | util.copyfiles(path, newpath) | |
1883 | if opts['empty']: |
|
1881 | if opts['empty']: | |
1884 | try: |
|
1882 | try: | |
1885 | os.unlink(q.join(q.status_path)) |
|
1883 | os.unlink(q.join(q.status_path)) | |
1886 | except: |
|
1884 | except: | |
1887 | pass |
|
1885 | pass | |
1888 | return 0 |
|
1886 | return 0 | |
1889 |
|
1887 | |||
1890 | def strip(ui, repo, rev, **opts): |
|
1888 | def strip(ui, repo, rev, **opts): | |
1891 | """strip a revision and all later revs on the same branch""" |
|
1889 | """strip a revision and all later revs on the same branch""" | |
1892 | rev = repo.lookup(rev) |
|
1890 | rev = repo.lookup(rev) | |
1893 | backup = 'all' |
|
1891 | backup = 'all' | |
1894 | if opts['backup']: |
|
1892 | if opts['backup']: | |
1895 | backup = 'strip' |
|
1893 | backup = 'strip' | |
1896 | elif opts['nobackup']: |
|
1894 | elif opts['nobackup']: | |
1897 | backup = 'none' |
|
1895 | backup = 'none' | |
1898 | update = repo.dirstate.parents()[0] != revlog.nullid |
|
1896 | update = repo.dirstate.parents()[0] != revlog.nullid | |
1899 | repo.mq.strip(repo, rev, backup=backup, update=update) |
|
1897 | repo.mq.strip(repo, rev, backup=backup, update=update) | |
1900 | return 0 |
|
1898 | return 0 | |
1901 |
|
1899 | |||
1902 | def select(ui, repo, *args, **opts): |
|
1900 | def select(ui, repo, *args, **opts): | |
1903 | '''set or print guarded patches to push |
|
1901 | '''set or print guarded patches to push | |
1904 |
|
1902 | |||
1905 | Use the qguard command to set or print guards on patch, then use |
|
1903 | Use the qguard command to set or print guards on patch, then use | |
1906 | qselect to tell mq which guards to use. A patch will be pushed if it |
|
1904 | qselect to tell mq which guards to use. A patch will be pushed if it | |
1907 | has no guards or any positive guards match the currently selected guard, |
|
1905 | has no guards or any positive guards match the currently selected guard, | |
1908 | but will not be pushed if any negative guards match the current guard. |
|
1906 | but will not be pushed if any negative guards match the current guard. | |
1909 | For example: |
|
1907 | For example: | |
1910 |
|
1908 | |||
1911 | qguard foo.patch -stable (negative guard) |
|
1909 | qguard foo.patch -stable (negative guard) | |
1912 | qguard bar.patch +stable (positive guard) |
|
1910 | qguard bar.patch +stable (positive guard) | |
1913 | qselect stable |
|
1911 | qselect stable | |
1914 |
|
1912 | |||
1915 | This activates the "stable" guard. mq will skip foo.patch (because |
|
1913 | This activates the "stable" guard. mq will skip foo.patch (because | |
1916 | it has a negative match) but push bar.patch (because it |
|
1914 | it has a negative match) but push bar.patch (because it | |
1917 | has a positive match). |
|
1915 | has a positive match). | |
1918 |
|
1916 | |||
1919 | With no arguments, prints the currently active guards. |
|
1917 | With no arguments, prints the currently active guards. | |
1920 | With one argument, sets the active guard. |
|
1918 | With one argument, sets the active guard. | |
1921 |
|
1919 | |||
1922 | Use -n/--none to deactivate guards (no other arguments needed). |
|
1920 | Use -n/--none to deactivate guards (no other arguments needed). | |
1923 | When no guards are active, patches with positive guards are skipped |
|
1921 | When no guards are active, patches with positive guards are skipped | |
1924 | and patches with negative guards are pushed. |
|
1922 | and patches with negative guards are pushed. | |
1925 |
|
1923 | |||
1926 | qselect can change the guards on applied patches. It does not pop |
|
1924 | qselect can change the guards on applied patches. It does not pop | |
1927 | guarded patches by default. Use --pop to pop back to the last applied |
|
1925 | guarded patches by default. Use --pop to pop back to the last applied | |
1928 | patch that is not guarded. Use --reapply (which implies --pop) to push |
|
1926 | patch that is not guarded. Use --reapply (which implies --pop) to push | |
1929 | back to the current patch afterwards, but skip guarded patches. |
|
1927 | back to the current patch afterwards, but skip guarded patches. | |
1930 |
|
1928 | |||
1931 | Use -s/--series to print a list of all guards in the series file (no |
|
1929 | Use -s/--series to print a list of all guards in the series file (no | |
1932 | other arguments needed). Use -v for more information.''' |
|
1930 | other arguments needed). Use -v for more information.''' | |
1933 |
|
1931 | |||
1934 | q = repo.mq |
|
1932 | q = repo.mq | |
1935 | guards = q.active() |
|
1933 | guards = q.active() | |
1936 | if args or opts['none']: |
|
1934 | if args or opts['none']: | |
1937 | old_unapplied = q.unapplied(repo) |
|
1935 | old_unapplied = q.unapplied(repo) | |
1938 | old_guarded = [i for i in xrange(len(q.applied)) if |
|
1936 | old_guarded = [i for i in xrange(len(q.applied)) if | |
1939 | not q.pushable(i)[0]] |
|
1937 | not q.pushable(i)[0]] | |
1940 | q.set_active(args) |
|
1938 | q.set_active(args) | |
1941 | q.save_dirty() |
|
1939 | q.save_dirty() | |
1942 | if not args: |
|
1940 | if not args: | |
1943 | ui.status(_('guards deactivated\n')) |
|
1941 | ui.status(_('guards deactivated\n')) | |
1944 | if not opts['pop'] and not opts['reapply']: |
|
1942 | if not opts['pop'] and not opts['reapply']: | |
1945 | unapplied = q.unapplied(repo) |
|
1943 | unapplied = q.unapplied(repo) | |
1946 | guarded = [i for i in xrange(len(q.applied)) |
|
1944 | guarded = [i for i in xrange(len(q.applied)) | |
1947 | if not q.pushable(i)[0]] |
|
1945 | if not q.pushable(i)[0]] | |
1948 | if len(unapplied) != len(old_unapplied): |
|
1946 | if len(unapplied) != len(old_unapplied): | |
1949 | ui.status(_('number of unguarded, unapplied patches has ' |
|
1947 | ui.status(_('number of unguarded, unapplied patches has ' | |
1950 | 'changed from %d to %d\n') % |
|
1948 | 'changed from %d to %d\n') % | |
1951 | (len(old_unapplied), len(unapplied))) |
|
1949 | (len(old_unapplied), len(unapplied))) | |
1952 | if len(guarded) != len(old_guarded): |
|
1950 | if len(guarded) != len(old_guarded): | |
1953 | ui.status(_('number of guarded, applied patches has changed ' |
|
1951 | ui.status(_('number of guarded, applied patches has changed ' | |
1954 | 'from %d to %d\n') % |
|
1952 | 'from %d to %d\n') % | |
1955 | (len(old_guarded), len(guarded))) |
|
1953 | (len(old_guarded), len(guarded))) | |
1956 | elif opts['series']: |
|
1954 | elif opts['series']: | |
1957 | guards = {} |
|
1955 | guards = {} | |
1958 | noguards = 0 |
|
1956 | noguards = 0 | |
1959 | for gs in q.series_guards: |
|
1957 | for gs in q.series_guards: | |
1960 | if not gs: |
|
1958 | if not gs: | |
1961 | noguards += 1 |
|
1959 | noguards += 1 | |
1962 | for g in gs: |
|
1960 | for g in gs: | |
1963 | guards.setdefault(g, 0) |
|
1961 | guards.setdefault(g, 0) | |
1964 | guards[g] += 1 |
|
1962 | guards[g] += 1 | |
1965 | if ui.verbose: |
|
1963 | if ui.verbose: | |
1966 | guards['NONE'] = noguards |
|
1964 | guards['NONE'] = noguards | |
1967 | guards = guards.items() |
|
1965 | guards = guards.items() | |
1968 | guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:])) |
|
1966 | guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:])) | |
1969 | if guards: |
|
1967 | if guards: | |
1970 | ui.note(_('guards in series file:\n')) |
|
1968 | ui.note(_('guards in series file:\n')) | |
1971 | for guard, count in guards: |
|
1969 | for guard, count in guards: | |
1972 | ui.note('%2d ' % count) |
|
1970 | ui.note('%2d ' % count) | |
1973 | ui.write(guard, '\n') |
|
1971 | ui.write(guard, '\n') | |
1974 | else: |
|
1972 | else: | |
1975 | ui.note(_('no guards in series file\n')) |
|
1973 | ui.note(_('no guards in series file\n')) | |
1976 | else: |
|
1974 | else: | |
1977 | if guards: |
|
1975 | if guards: | |
1978 | ui.note(_('active guards:\n')) |
|
1976 | ui.note(_('active guards:\n')) | |
1979 | for g in guards: |
|
1977 | for g in guards: | |
1980 | ui.write(g, '\n') |
|
1978 | ui.write(g, '\n') | |
1981 | else: |
|
1979 | else: | |
1982 | ui.write(_('no active guards\n')) |
|
1980 | ui.write(_('no active guards\n')) | |
1983 | reapply = opts['reapply'] and q.applied and q.appliedname(-1) |
|
1981 | reapply = opts['reapply'] and q.applied and q.appliedname(-1) | |
1984 | popped = False |
|
1982 | popped = False | |
1985 | if opts['pop'] or opts['reapply']: |
|
1983 | if opts['pop'] or opts['reapply']: | |
1986 | for i in xrange(len(q.applied)): |
|
1984 | for i in xrange(len(q.applied)): | |
1987 | pushable, reason = q.pushable(i) |
|
1985 | pushable, reason = q.pushable(i) | |
1988 | if not pushable: |
|
1986 | if not pushable: | |
1989 | ui.status(_('popping guarded patches\n')) |
|
1987 | ui.status(_('popping guarded patches\n')) | |
1990 | popped = True |
|
1988 | popped = True | |
1991 | if i == 0: |
|
1989 | if i == 0: | |
1992 | q.pop(repo, all=True) |
|
1990 | q.pop(repo, all=True) | |
1993 | else: |
|
1991 | else: | |
1994 | q.pop(repo, i-1) |
|
1992 | q.pop(repo, i-1) | |
1995 | break |
|
1993 | break | |
1996 | if popped: |
|
1994 | if popped: | |
1997 | try: |
|
1995 | try: | |
1998 | if reapply: |
|
1996 | if reapply: | |
1999 | ui.status(_('reapplying unguarded patches\n')) |
|
1997 | ui.status(_('reapplying unguarded patches\n')) | |
2000 | q.push(repo, reapply) |
|
1998 | q.push(repo, reapply) | |
2001 | finally: |
|
1999 | finally: | |
2002 | q.save_dirty() |
|
2000 | q.save_dirty() | |
2003 |
|
2001 | |||
2004 | def reposetup(ui, repo): |
|
2002 | def reposetup(ui, repo): | |
2005 | class mqrepo(repo.__class__): |
|
2003 | class mqrepo(repo.__class__): | |
2006 | def abort_if_wdir_patched(self, errmsg, force=False): |
|
2004 | def abort_if_wdir_patched(self, errmsg, force=False): | |
2007 | if self.mq.applied and not force: |
|
2005 | if self.mq.applied and not force: | |
2008 | parent = revlog.hex(self.dirstate.parents()[0]) |
|
2006 | parent = revlog.hex(self.dirstate.parents()[0]) | |
2009 | if parent in [s.rev for s in self.mq.applied]: |
|
2007 | if parent in [s.rev for s in self.mq.applied]: | |
2010 | raise util.Abort(errmsg) |
|
2008 | raise util.Abort(errmsg) | |
2011 |
|
2009 | |||
2012 | def commit(self, *args, **opts): |
|
2010 | def commit(self, *args, **opts): | |
2013 | if len(args) >= 6: |
|
2011 | if len(args) >= 6: | |
2014 | force = args[5] |
|
2012 | force = args[5] | |
2015 | else: |
|
2013 | else: | |
2016 | force = opts.get('force') |
|
2014 | force = opts.get('force') | |
2017 | self.abort_if_wdir_patched( |
|
2015 | self.abort_if_wdir_patched( | |
2018 | _('cannot commit over an applied mq patch'), |
|
2016 | _('cannot commit over an applied mq patch'), | |
2019 | force) |
|
2017 | force) | |
2020 |
|
2018 | |||
2021 | return super(mqrepo, self).commit(*args, **opts) |
|
2019 | return super(mqrepo, self).commit(*args, **opts) | |
2022 |
|
2020 | |||
2023 | def push(self, remote, force=False, revs=None): |
|
2021 | def push(self, remote, force=False, revs=None): | |
2024 | if self.mq.applied and not force: |
|
2022 | if self.mq.applied and not force: | |
2025 | raise util.Abort(_('source has mq patches applied')) |
|
2023 | raise util.Abort(_('source has mq patches applied')) | |
2026 | return super(mqrepo, self).push(remote, force, revs) |
|
2024 | return super(mqrepo, self).push(remote, force, revs) | |
2027 |
|
2025 | |||
2028 | def tags(self): |
|
2026 | def tags(self): | |
2029 | if self.tagscache: |
|
2027 | if self.tagscache: | |
2030 | return self.tagscache |
|
2028 | return self.tagscache | |
2031 |
|
2029 | |||
2032 | tagscache = super(mqrepo, self).tags() |
|
2030 | tagscache = super(mqrepo, self).tags() | |
2033 |
|
2031 | |||
2034 | q = self.mq |
|
2032 | q = self.mq | |
2035 | if not q.applied: |
|
2033 | if not q.applied: | |
2036 | return tagscache |
|
2034 | return tagscache | |
2037 |
|
2035 | |||
2038 | mqtags = [(patch.rev, patch.name) for patch in q.applied] |
|
2036 | mqtags = [(patch.rev, patch.name) for patch in q.applied] | |
2039 | mqtags.append((mqtags[-1][0], 'qtip')) |
|
2037 | mqtags.append((mqtags[-1][0], 'qtip')) | |
2040 | mqtags.append((mqtags[0][0], 'qbase')) |
|
2038 | mqtags.append((mqtags[0][0], 'qbase')) | |
2041 | for patch in mqtags: |
|
2039 | for patch in mqtags: | |
2042 | if patch[1] in tagscache: |
|
2040 | if patch[1] in tagscache: | |
2043 | self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
|
2041 | self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) | |
2044 | else: |
|
2042 | else: | |
2045 | tagscache[patch[1]] = revlog.bin(patch[0]) |
|
2043 | tagscache[patch[1]] = revlog.bin(patch[0]) | |
2046 |
|
2044 | |||
2047 | return tagscache |
|
2045 | return tagscache | |
2048 |
|
2046 | |||
2049 | def _branchtags(self): |
|
2047 | def _branchtags(self): | |
2050 | q = self.mq |
|
2048 | q = self.mq | |
2051 | if not q.applied: |
|
2049 | if not q.applied: | |
2052 | return super(mqrepo, self)._branchtags() |
|
2050 | return super(mqrepo, self)._branchtags() | |
2053 |
|
2051 | |||
2054 | self.branchcache = {} # avoid recursion in changectx |
|
2052 | self.branchcache = {} # avoid recursion in changectx | |
2055 | cl = self.changelog |
|
2053 | cl = self.changelog | |
2056 | partial, last, lrev = self._readbranchcache() |
|
2054 | partial, last, lrev = self._readbranchcache() | |
2057 |
|
2055 | |||
2058 | qbase = cl.rev(revlog.bin(q.applied[0].rev)) |
|
2056 | qbase = cl.rev(revlog.bin(q.applied[0].rev)) | |
2059 | start = lrev + 1 |
|
2057 | start = lrev + 1 | |
2060 | if start < qbase: |
|
2058 | if start < qbase: | |
2061 | # update the cache (excluding the patches) and save it |
|
2059 | # update the cache (excluding the patches) and save it | |
2062 | self._updatebranchcache(partial, lrev+1, qbase) |
|
2060 | self._updatebranchcache(partial, lrev+1, qbase) | |
2063 | self._writebranchcache(partial, cl.node(qbase-1), qbase-1) |
|
2061 | self._writebranchcache(partial, cl.node(qbase-1), qbase-1) | |
2064 | start = qbase |
|
2062 | start = qbase | |
2065 | # if start = qbase, the cache is as updated as it should be. |
|
2063 | # if start = qbase, the cache is as updated as it should be. | |
2066 | # if start > qbase, the cache includes (part of) the patches. |
|
2064 | # if start > qbase, the cache includes (part of) the patches. | |
2067 | # we might as well use it, but we won't save it. |
|
2065 | # we might as well use it, but we won't save it. | |
2068 |
|
2066 | |||
2069 | # update the cache up to the tip |
|
2067 | # update the cache up to the tip | |
2070 | self._updatebranchcache(partial, start, cl.count()) |
|
2068 | self._updatebranchcache(partial, start, cl.count()) | |
2071 |
|
2069 | |||
2072 | return partial |
|
2070 | return partial | |
2073 |
|
2071 | |||
2074 | if repo.local(): |
|
2072 | if repo.local(): | |
2075 | repo.__class__ = mqrepo |
|
2073 | repo.__class__ = mqrepo | |
2076 | repo.mq = queue(ui, repo.join("")) |
|
2074 | repo.mq = queue(ui, repo.join("")) | |
2077 |
|
2075 | |||
2078 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
2076 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] | |
2079 |
|
2077 | |||
2080 | cmdtable = { |
|
2078 | cmdtable = { | |
2081 | "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'), |
|
2079 | "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'), | |
2082 | "qclone": (clone, |
|
2080 | "qclone": (clone, | |
2083 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
2081 | [('', 'pull', None, _('use pull protocol to copy metadata')), | |
2084 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
2082 | ('U', 'noupdate', None, _('do not update the new working directories')), | |
2085 | ('', 'uncompressed', None, |
|
2083 | ('', 'uncompressed', None, | |
2086 | _('use uncompressed transfer (fast over LAN)')), |
|
2084 | _('use uncompressed transfer (fast over LAN)')), | |
2087 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
2085 | ('e', 'ssh', '', _('specify ssh command to use')), | |
2088 | ('p', 'patches', '', _('location of source patch repo')), |
|
2086 | ('p', 'patches', '', _('location of source patch repo')), | |
2089 | ('', 'remotecmd', '', |
|
2087 | ('', 'remotecmd', '', | |
2090 | _('specify hg command to run on the remote side'))], |
|
2088 | _('specify hg command to run on the remote side'))], | |
2091 | 'hg qclone [OPTION]... SOURCE [DEST]'), |
|
2089 | 'hg qclone [OPTION]... SOURCE [DEST]'), | |
2092 | "qcommit|qci": |
|
2090 | "qcommit|qci": | |
2093 | (commit, |
|
2091 | (commit, | |
2094 | commands.table["^commit|ci"][1], |
|
2092 | commands.table["^commit|ci"][1], | |
2095 | 'hg qcommit [OPTION]... [FILE]...'), |
|
2093 | 'hg qcommit [OPTION]... [FILE]...'), | |
2096 | "^qdiff": (diff, |
|
2094 | "^qdiff": (diff, | |
2097 | [('g', 'git', None, _('use git extended diff format')), |
|
2095 | [('g', 'git', None, _('use git extended diff format')), | |
2098 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2096 | ('I', 'include', [], _('include names matching the given patterns')), | |
2099 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
2097 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2100 | 'hg qdiff [-I] [-X] [FILE]...'), |
|
2098 | 'hg qdiff [-I] [-X] [FILE]...'), | |
2101 | "qdelete|qremove|qrm": |
|
2099 | "qdelete|qremove|qrm": | |
2102 | (delete, |
|
2100 | (delete, | |
2103 | [('k', 'keep', None, _('keep patch file')), |
|
2101 | [('k', 'keep', None, _('keep patch file')), | |
2104 | ('r', 'rev', [], _('stop managing a revision'))], |
|
2102 | ('r', 'rev', [], _('stop managing a revision'))], | |
2105 | 'hg qdelete [-k] [-r REV]... PATCH...'), |
|
2103 | 'hg qdelete [-k] [-r REV]... PATCH...'), | |
2106 | 'qfold': |
|
2104 | 'qfold': | |
2107 | (fold, |
|
2105 | (fold, | |
2108 | [('e', 'edit', None, _('edit patch header')), |
|
2106 | [('e', 'edit', None, _('edit patch header')), | |
2109 | ('k', 'keep', None, _('keep folded patch files')) |
|
2107 | ('k', 'keep', None, _('keep folded patch files')) | |
2110 | ] + commands.commitopts, |
|
2108 | ] + commands.commitopts, | |
2111 | 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), |
|
2109 | 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), | |
2112 | 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')), |
|
2110 | 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')), | |
2113 | ('n', 'none', None, _('drop all guards'))], |
|
2111 | ('n', 'none', None, _('drop all guards'))], | |
2114 | 'hg qguard [PATCH] [+GUARD...] [-GUARD...]'), |
|
2112 | 'hg qguard [PATCH] [+GUARD...] [-GUARD...]'), | |
2115 | 'qheader': (header, [], |
|
2113 | 'qheader': (header, [], | |
2116 | _('hg qheader [PATCH]')), |
|
2114 | _('hg qheader [PATCH]')), | |
2117 | "^qimport": |
|
2115 | "^qimport": | |
2118 | (qimport, |
|
2116 | (qimport, | |
2119 | [('e', 'existing', None, 'import file in patch dir'), |
|
2117 | [('e', 'existing', None, 'import file in patch dir'), | |
2120 | ('n', 'name', '', 'patch file name'), |
|
2118 | ('n', 'name', '', 'patch file name'), | |
2121 | ('f', 'force', None, 'overwrite existing files'), |
|
2119 | ('f', 'force', None, 'overwrite existing files'), | |
2122 | ('r', 'rev', [], 'place existing revisions under mq control'), |
|
2120 | ('r', 'rev', [], 'place existing revisions under mq control'), | |
2123 | ('g', 'git', None, _('use git extended diff format'))], |
|
2121 | ('g', 'git', None, _('use git extended diff format'))], | |
2124 | 'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'), |
|
2122 | 'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'), | |
2125 | "^qinit": |
|
2123 | "^qinit": | |
2126 | (init, |
|
2124 | (init, | |
2127 | [('c', 'create-repo', None, 'create queue repository')], |
|
2125 | [('c', 'create-repo', None, 'create queue repository')], | |
2128 | 'hg qinit [-c]'), |
|
2126 | 'hg qinit [-c]'), | |
2129 | "qnew": |
|
2127 | "qnew": | |
2130 | (new, |
|
2128 | (new, | |
2131 | [('e', 'edit', None, _('edit commit message')), |
|
2129 | [('e', 'edit', None, _('edit commit message')), | |
2132 | ('f', 'force', None, _('import uncommitted changes into patch')) |
|
2130 | ('f', 'force', None, _('import uncommitted changes into patch')) | |
2133 | ] + commands.commitopts, |
|
2131 | ] + commands.commitopts, | |
2134 | 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'), |
|
2132 | 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'), | |
2135 | "qnext": (next, [] + seriesopts, 'hg qnext [-s]'), |
|
2133 | "qnext": (next, [] + seriesopts, 'hg qnext [-s]'), | |
2136 | "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'), |
|
2134 | "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'), | |
2137 | "^qpop": |
|
2135 | "^qpop": | |
2138 | (pop, |
|
2136 | (pop, | |
2139 | [('a', 'all', None, 'pop all patches'), |
|
2137 | [('a', 'all', None, 'pop all patches'), | |
2140 | ('n', 'name', '', 'queue name to pop'), |
|
2138 | ('n', 'name', '', 'queue name to pop'), | |
2141 | ('f', 'force', None, 'forget any local changes')], |
|
2139 | ('f', 'force', None, 'forget any local changes')], | |
2142 | 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), |
|
2140 | 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), | |
2143 | "^qpush": |
|
2141 | "^qpush": | |
2144 | (push, |
|
2142 | (push, | |
2145 | [('f', 'force', None, 'apply if the patch has rejects'), |
|
2143 | [('f', 'force', None, 'apply if the patch has rejects'), | |
2146 | ('l', 'list', None, 'list patch name in commit text'), |
|
2144 | ('l', 'list', None, 'list patch name in commit text'), | |
2147 | ('a', 'all', None, 'apply all patches'), |
|
2145 | ('a', 'all', None, 'apply all patches'), | |
2148 | ('m', 'merge', None, 'merge from another queue'), |
|
2146 | ('m', 'merge', None, 'merge from another queue'), | |
2149 | ('n', 'name', '', 'merge queue name')], |
|
2147 | ('n', 'name', '', 'merge queue name')], | |
2150 | 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), |
|
2148 | 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), | |
2151 | "^qrefresh": |
|
2149 | "^qrefresh": | |
2152 | (refresh, |
|
2150 | (refresh, | |
2153 | [('e', 'edit', None, _('edit commit message')), |
|
2151 | [('e', 'edit', None, _('edit commit message')), | |
2154 | ('g', 'git', None, _('use git extended diff format')), |
|
2152 | ('g', 'git', None, _('use git extended diff format')), | |
2155 | ('s', 'short', None, 'refresh only files already in the patch'), |
|
2153 | ('s', 'short', None, 'refresh only files already in the patch'), | |
2156 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2154 | ('I', 'include', [], _('include names matching the given patterns')), | |
2157 | ('X', 'exclude', [], _('exclude names matching the given patterns')) |
|
2155 | ('X', 'exclude', [], _('exclude names matching the given patterns')) | |
2158 | ] + commands.commitopts, |
|
2156 | ] + commands.commitopts, | |
2159 | 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'), |
|
2157 | 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'), | |
2160 | 'qrename|qmv': |
|
2158 | 'qrename|qmv': | |
2161 | (rename, [], 'hg qrename PATCH1 [PATCH2]'), |
|
2159 | (rename, [], 'hg qrename PATCH1 [PATCH2]'), | |
2162 | "qrestore": |
|
2160 | "qrestore": | |
2163 | (restore, |
|
2161 | (restore, | |
2164 | [('d', 'delete', None, 'delete save entry'), |
|
2162 | [('d', 'delete', None, 'delete save entry'), | |
2165 | ('u', 'update', None, 'update queue working dir')], |
|
2163 | ('u', 'update', None, 'update queue working dir')], | |
2166 | 'hg qrestore [-d] [-u] REV'), |
|
2164 | 'hg qrestore [-d] [-u] REV'), | |
2167 | "qsave": |
|
2165 | "qsave": | |
2168 | (save, |
|
2166 | (save, | |
2169 | [('c', 'copy', None, 'copy patch directory'), |
|
2167 | [('c', 'copy', None, 'copy patch directory'), | |
2170 | ('n', 'name', '', 'copy directory name'), |
|
2168 | ('n', 'name', '', 'copy directory name'), | |
2171 | ('e', 'empty', None, 'clear queue status file'), |
|
2169 | ('e', 'empty', None, 'clear queue status file'), | |
2172 | ('f', 'force', None, 'force copy')] + commands.commitopts, |
|
2170 | ('f', 'force', None, 'force copy')] + commands.commitopts, | |
2173 | 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), |
|
2171 | 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), | |
2174 | "qselect": (select, |
|
2172 | "qselect": (select, | |
2175 | [('n', 'none', None, _('disable all guards')), |
|
2173 | [('n', 'none', None, _('disable all guards')), | |
2176 | ('s', 'series', None, _('list all guards in series file')), |
|
2174 | ('s', 'series', None, _('list all guards in series file')), | |
2177 | ('', 'pop', None, |
|
2175 | ('', 'pop', None, | |
2178 | _('pop to before first guarded applied patch')), |
|
2176 | _('pop to before first guarded applied patch')), | |
2179 | ('', 'reapply', None, _('pop, then reapply patches'))], |
|
2177 | ('', 'reapply', None, _('pop, then reapply patches'))], | |
2180 | 'hg qselect [OPTION...] [GUARD...]'), |
|
2178 | 'hg qselect [OPTION...] [GUARD...]'), | |
2181 | "qseries": |
|
2179 | "qseries": | |
2182 | (series, |
|
2180 | (series, | |
2183 | [('m', 'missing', None, 'print patches not in series')] + seriesopts, |
|
2181 | [('m', 'missing', None, 'print patches not in series')] + seriesopts, | |
2184 | 'hg qseries [-ms]'), |
|
2182 | 'hg qseries [-ms]'), | |
2185 | "^strip": |
|
2183 | "^strip": | |
2186 | (strip, |
|
2184 | (strip, | |
2187 | [('f', 'force', None, 'force multi-head removal'), |
|
2185 | [('f', 'force', None, 'force multi-head removal'), | |
2188 | ('b', 'backup', None, 'bundle unrelated changesets'), |
|
2186 | ('b', 'backup', None, 'bundle unrelated changesets'), | |
2189 | ('n', 'nobackup', None, 'no backups')], |
|
2187 | ('n', 'nobackup', None, 'no backups')], | |
2190 | 'hg strip [-f] [-b] [-n] REV'), |
|
2188 | 'hg strip [-f] [-b] [-n] REV'), | |
2191 | "qtop": (top, [] + seriesopts, 'hg qtop [-s]'), |
|
2189 | "qtop": (top, [] + seriesopts, 'hg qtop [-s]'), | |
2192 | "qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'), |
|
2190 | "qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'), | |
2193 | } |
|
2191 | } |
@@ -1,267 +1,305 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | echo "[extensions]" >> $HGRCPATH |
|
3 | echo "[extensions]" >> $HGRCPATH | |
4 | echo "mq=" >> $HGRCPATH |
|
4 | echo "mq=" >> $HGRCPATH | |
5 |
|
5 | |||
6 | echo % help |
|
6 | echo % help | |
7 | hg help mq |
|
7 | hg help mq | |
8 |
|
8 | |||
9 | hg init a |
|
9 | hg init a | |
10 | cd a |
|
10 | cd a | |
11 | echo a > a |
|
11 | echo a > a | |
12 | hg ci -Ama |
|
12 | hg ci -Ama | |
13 |
|
13 | |||
14 | hg clone . ../k |
|
14 | hg clone . ../k | |
15 |
|
15 | |||
16 | mkdir b |
|
16 | mkdir b | |
17 | echo z > b/z |
|
17 | echo z > b/z | |
18 | hg ci -Ama |
|
18 | hg ci -Ama | |
19 |
|
19 | |||
20 | echo % qinit |
|
20 | echo % qinit | |
21 |
|
21 | |||
22 | hg qinit |
|
22 | hg qinit | |
23 |
|
23 | |||
24 | cd .. |
|
24 | cd .. | |
25 | hg init b |
|
25 | hg init b | |
26 |
|
26 | |||
27 | echo % -R qinit |
|
27 | echo % -R qinit | |
28 |
|
28 | |||
29 | hg -R b qinit |
|
29 | hg -R b qinit | |
30 |
|
30 | |||
31 | hg init c |
|
31 | hg init c | |
32 |
|
32 | |||
33 | echo % qinit -c |
|
33 | echo % qinit -c | |
34 |
|
34 | |||
35 | hg --cwd c qinit -c |
|
35 | hg --cwd c qinit -c | |
36 | hg -R c/.hg/patches st |
|
36 | hg -R c/.hg/patches st | |
37 |
|
37 | |||
38 | echo % qnew implies add |
|
38 | echo % qnew implies add | |
39 |
|
39 | |||
40 | hg -R c qnew test.patch |
|
40 | hg -R c qnew test.patch | |
41 | hg -R c/.hg/patches st |
|
41 | hg -R c/.hg/patches st | |
42 |
|
42 | |||
43 | cd a |
|
43 | cd a | |
44 |
|
44 | |||
45 | echo % qnew -m |
|
45 | echo % qnew -m | |
46 |
|
46 | |||
47 | hg qnew -m 'foo bar' test.patch |
|
47 | hg qnew -m 'foo bar' test.patch | |
48 | cat .hg/patches/test.patch |
|
48 | cat .hg/patches/test.patch | |
49 |
|
49 | |||
50 | echo % qrefresh |
|
50 | echo % qrefresh | |
51 |
|
51 | |||
52 | echo a >> a |
|
52 | echo a >> a | |
53 | hg qrefresh |
|
53 | hg qrefresh | |
54 | sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \ |
|
54 | sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \ | |
55 | -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
55 | -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
56 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch |
|
56 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch | |
57 |
|
57 | |||
58 | echo % qpop |
|
58 | echo % qpop | |
59 |
|
59 | |||
60 | hg qpop |
|
60 | hg qpop | |
61 |
|
61 | |||
62 | echo % qpush |
|
62 | echo % qpush | |
63 |
|
63 | |||
64 | hg qpush |
|
64 | hg qpush | |
65 |
|
65 | |||
66 | cd .. |
|
66 | cd .. | |
67 |
|
67 | |||
68 | echo % pop/push outside repo |
|
68 | echo % pop/push outside repo | |
69 |
|
69 | |||
70 | hg -R a qpop |
|
70 | hg -R a qpop | |
71 | hg -R a qpush |
|
71 | hg -R a qpush | |
72 |
|
72 | |||
73 | cd a |
|
73 | cd a | |
74 | hg qnew test2.patch |
|
74 | hg qnew test2.patch | |
75 |
|
75 | |||
76 | echo % qrefresh in subdir |
|
76 | echo % qrefresh in subdir | |
77 |
|
77 | |||
78 | cd b |
|
78 | cd b | |
79 | echo a > a |
|
79 | echo a > a | |
80 | hg add a |
|
80 | hg add a | |
81 | hg qrefresh |
|
81 | hg qrefresh | |
82 |
|
82 | |||
83 | echo % pop/push -a in subdir |
|
83 | echo % pop/push -a in subdir | |
84 |
|
84 | |||
85 | hg qpop -a |
|
85 | hg qpop -a | |
86 | hg --traceback qpush -a |
|
86 | hg --traceback qpush -a | |
87 |
|
87 | |||
88 | echo % qseries |
|
88 | echo % qseries | |
89 | hg qseries |
|
89 | hg qseries | |
90 | hg qpop |
|
90 | hg qpop | |
91 | hg qseries -vs |
|
91 | hg qseries -vs | |
92 | hg qpush |
|
92 | hg qpush | |
93 |
|
93 | |||
94 | echo % qapplied |
|
94 | echo % qapplied | |
95 | hg qapplied |
|
95 | hg qapplied | |
96 |
|
96 | |||
97 | echo % qtop |
|
97 | echo % qtop | |
98 | hg qtop |
|
98 | hg qtop | |
99 |
|
99 | |||
100 | echo % qprev |
|
100 | echo % qprev | |
101 | hg qprev |
|
101 | hg qprev | |
102 |
|
102 | |||
103 | echo % qnext |
|
103 | echo % qnext | |
104 | hg qnext |
|
104 | hg qnext | |
105 |
|
105 | |||
106 | echo % pop, qnext, qprev, qapplied |
|
106 | echo % pop, qnext, qprev, qapplied | |
107 | hg qpop |
|
107 | hg qpop | |
108 | hg qnext |
|
108 | hg qnext | |
109 | hg qprev |
|
109 | hg qprev | |
110 | hg qapplied |
|
110 | hg qapplied | |
111 |
|
111 | |||
112 | echo % commit should fail |
|
112 | echo % commit should fail | |
113 | hg commit |
|
113 | hg commit | |
114 |
|
114 | |||
115 | echo % push should fail |
|
115 | echo % push should fail | |
116 | hg push ../../k |
|
116 | hg push ../../k | |
117 |
|
117 | |||
118 | echo % qunapplied |
|
118 | echo % qunapplied | |
119 | hg qunapplied |
|
119 | hg qunapplied | |
120 |
|
120 | |||
121 | echo % qpush/qpop with index |
|
121 | echo % qpush/qpop with index | |
122 | hg qnew test1b.patch |
|
122 | hg qnew test1b.patch | |
123 | echo 1b > 1b |
|
123 | echo 1b > 1b | |
124 | hg add 1b |
|
124 | hg add 1b | |
125 | hg qrefresh |
|
125 | hg qrefresh | |
126 | hg qpush 2 |
|
126 | hg qpush 2 | |
127 | hg qpop 0 |
|
127 | hg qpop 0 | |
128 | hg qpush test.patch+1 |
|
128 | hg qpush test.patch+1 | |
129 | hg qpush test.patch+2 |
|
129 | hg qpush test.patch+2 | |
130 | hg qpop test2.patch-1 |
|
130 | hg qpop test2.patch-1 | |
131 | hg qpop test2.patch-2 |
|
131 | hg qpop test2.patch-2 | |
132 | hg qpush test1b.patch+1 |
|
132 | hg qpush test1b.patch+1 | |
133 |
|
133 | |||
134 | echo % push should succeed |
|
134 | echo % push should succeed | |
135 | hg qpop -a |
|
135 | hg qpop -a | |
136 | hg push ../../k |
|
136 | hg push ../../k | |
137 |
|
137 | |||
138 | echo % strip |
|
138 | echo % strip | |
139 | cd ../../b |
|
139 | cd ../../b | |
140 | echo x>x |
|
140 | echo x>x | |
141 | hg ci -Ama |
|
141 | hg ci -Ama | |
142 | hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
142 | hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
143 | hg unbundle .hg/strip-backup/* |
|
143 | hg unbundle .hg/strip-backup/* | |
144 |
|
144 | |||
145 | echo '% cd b; hg qrefresh' |
|
145 | echo '% cd b; hg qrefresh' | |
146 | hg init refresh |
|
146 | hg init refresh | |
147 | cd refresh |
|
147 | cd refresh | |
148 | echo a > a |
|
148 | echo a > a | |
149 | hg ci -Ama -d'0 0' |
|
149 | hg ci -Ama -d'0 0' | |
150 | hg qnew -mfoo foo |
|
150 | hg qnew -mfoo foo | |
151 | echo a >> a |
|
151 | echo a >> a | |
152 | hg qrefresh |
|
152 | hg qrefresh | |
153 | mkdir b |
|
153 | mkdir b | |
154 | cd b |
|
154 | cd b | |
155 | echo f > f |
|
155 | echo f > f | |
156 | hg add f |
|
156 | hg add f | |
157 | hg qrefresh |
|
157 | hg qrefresh | |
158 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
158 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
159 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo |
|
159 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |
160 | echo % hg qrefresh . |
|
160 | echo % hg qrefresh . | |
161 | hg qrefresh . |
|
161 | hg qrefresh . | |
162 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
162 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
163 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo |
|
163 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |
164 | hg status |
|
164 | hg status | |
165 |
|
165 | |||
166 | echo % qpush failure |
|
166 | echo % qpush failure | |
167 | cd .. |
|
167 | cd .. | |
168 | hg qrefresh |
|
168 | hg qrefresh | |
169 | hg qnew -mbar bar |
|
169 | hg qnew -mbar bar | |
170 | echo foo > foo |
|
170 | echo foo > foo | |
171 | echo bar > bar |
|
171 | echo bar > bar | |
172 | hg add foo bar |
|
172 | hg add foo bar | |
173 | hg qrefresh |
|
173 | hg qrefresh | |
174 | hg qpop -a |
|
174 | hg qpop -a | |
175 | echo bar > foo |
|
175 | echo bar > foo | |
176 | hg qpush -a |
|
176 | hg qpush -a | |
177 | hg st |
|
177 | hg st | |
178 |
|
178 | |||
179 | cat >>$HGRCPATH <<EOF |
|
179 | cat >>$HGRCPATH <<EOF | |
180 | [diff] |
|
180 | [diff] | |
181 | git = True |
|
181 | git = True | |
182 | EOF |
|
182 | EOF | |
183 | cd .. |
|
183 | cd .. | |
184 | hg init git |
|
184 | hg init git | |
185 | cd git |
|
185 | cd git | |
186 | hg qinit |
|
186 | hg qinit | |
187 |
|
187 | |||
188 | hg qnew -m'new file' new |
|
188 | hg qnew -m'new file' new | |
189 | echo foo > new |
|
189 | echo foo > new | |
190 | chmod +x new |
|
190 | chmod +x new | |
191 | hg add new |
|
191 | hg add new | |
192 | hg qrefresh |
|
192 | hg qrefresh | |
193 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
193 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
194 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new |
|
194 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new | |
195 |
|
195 | |||
196 | hg qnew -m'copy file' copy |
|
196 | hg qnew -m'copy file' copy | |
197 | hg cp new copy |
|
197 | hg cp new copy | |
198 | hg qrefresh |
|
198 | hg qrefresh | |
199 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
199 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
200 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy |
|
200 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy | |
201 |
|
201 | |||
202 | hg qpop |
|
202 | hg qpop | |
203 | hg qpush |
|
203 | hg qpush | |
204 | hg qdiff |
|
204 | hg qdiff | |
205 | cat >>$HGRCPATH <<EOF |
|
205 | cat >>$HGRCPATH <<EOF | |
206 | [diff] |
|
206 | [diff] | |
207 | git = False |
|
207 | git = False | |
208 | EOF |
|
208 | EOF | |
209 | hg qdiff --git |
|
209 | hg qdiff --git | |
210 |
|
210 | |||
211 | cd .. |
|
211 | cd .. | |
212 | hg init slow |
|
212 | hg init slow | |
213 | cd slow |
|
213 | cd slow | |
214 | hg qinit |
|
214 | hg qinit | |
215 | echo foo > foo |
|
215 | echo foo > foo | |
216 | hg add foo |
|
216 | hg add foo | |
217 | hg ci -m 'add foo' |
|
217 | hg ci -m 'add foo' | |
218 | hg qnew bar |
|
218 | hg qnew bar | |
219 | echo bar > bar |
|
219 | echo bar > bar | |
220 | hg add bar |
|
220 | hg add bar | |
221 | hg mv foo baz |
|
221 | hg mv foo baz | |
222 | hg qrefresh --git |
|
222 | hg qrefresh --git | |
223 | hg up -C 0 |
|
223 | hg up -C 0 | |
224 | echo >> foo |
|
224 | echo >> foo | |
225 | hg ci -m 'change foo' |
|
225 | hg ci -m 'change foo' | |
226 | hg up -C 1 |
|
226 | hg up -C 1 | |
227 | hg qrefresh --git 2>&1 | grep -v 'saving bundle' |
|
227 | hg qrefresh --git 2>&1 | grep -v 'saving bundle' | |
228 | cat .hg/patches/bar |
|
228 | cat .hg/patches/bar | |
229 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . |
|
229 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . | |
230 | hg qrefresh --git |
|
230 | hg qrefresh --git | |
231 | cat .hg/patches/bar |
|
231 | cat .hg/patches/bar | |
232 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . |
|
232 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . | |
233 |
|
233 | |||
234 | echo |
|
234 | echo | |
235 | hg up -C 1 |
|
235 | hg up -C 1 | |
236 | echo >> foo |
|
236 | echo >> foo | |
237 | hg ci -m 'change foo again' |
|
237 | hg ci -m 'change foo again' | |
238 | hg up -C 2 |
|
238 | hg up -C 2 | |
239 | hg mv bar quux |
|
239 | hg mv bar quux | |
240 | hg mv baz bleh |
|
240 | hg mv baz bleh | |
241 | hg qrefresh --git 2>&1 | grep -v 'saving bundle' |
|
241 | hg qrefresh --git 2>&1 | grep -v 'saving bundle' | |
242 | cat .hg/patches/bar |
|
242 | cat .hg/patches/bar | |
243 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . |
|
243 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . | |
244 | hg mv quux fred |
|
244 | hg mv quux fred | |
245 | hg mv bleh barney |
|
245 | hg mv bleh barney | |
246 | hg qrefresh --git |
|
246 | hg qrefresh --git | |
247 | cat .hg/patches/bar |
|
247 | cat .hg/patches/bar | |
248 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . |
|
248 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . | |
249 |
|
249 | |||
250 | echo '% strip again' |
|
250 | echo '% strip again' | |
251 | cd .. |
|
251 | cd .. | |
252 | hg init strip |
|
252 | hg init strip | |
253 | cd strip |
|
253 | cd strip | |
254 | touch foo |
|
254 | touch foo | |
255 | hg add foo |
|
255 | hg add foo | |
256 | hg ci -m 'add foo' -d '0 0' |
|
256 | hg ci -m 'add foo' -d '0 0' | |
257 | echo >> foo |
|
257 | echo >> foo | |
258 | hg ci -m 'change foo 1' -d '0 0' |
|
258 | hg ci -m 'change foo 1' -d '0 0' | |
259 | hg up -C 0 |
|
259 | hg up -C 0 | |
260 | echo 1 >> foo |
|
260 | echo 1 >> foo | |
261 | hg ci -m 'change foo 2' -d '0 0' |
|
261 | hg ci -m 'change foo 2' -d '0 0' | |
262 | HGMERGE=true hg merge |
|
262 | HGMERGE=true hg merge | |
263 | hg ci -m merge -d '0 0' |
|
263 | hg ci -m merge -d '0 0' | |
264 | hg log |
|
264 | hg log | |
265 | hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
265 | hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
266 | hg log |
|
266 | hg log | |
|
267 | cd .. | |||
267 |
|
268 | |||
|
269 | echo '% qclone' | |||
|
270 | qlog() | |||
|
271 | { | |||
|
272 | echo 'main repo:' | |||
|
273 | hg log --template ' rev {rev}: {desc}\n' | |||
|
274 | echo 'patch repo:' | |||
|
275 | hg -R .hg/patches log --template ' rev {rev}: {desc}\n' | |||
|
276 | } | |||
|
277 | hg init qclonesource | |||
|
278 | cd qclonesource | |||
|
279 | echo foo > foo | |||
|
280 | hg add foo | |||
|
281 | hg ci -m 'add foo' | |||
|
282 | hg qinit -c | |||
|
283 | hg qnew patch1 | |||
|
284 | echo bar >> foo | |||
|
285 | hg qrefresh -m 'change foo' | |||
|
286 | hg qci -m checkpoint | |||
|
287 | qlog | |||
|
288 | cd .. | |||
|
289 | ||||
|
290 | # repo with patches applied | |||
|
291 | hg qclone qclonesource qclonedest | |||
|
292 | cd qclonedest | |||
|
293 | qlog | |||
|
294 | cd .. | |||
|
295 | ||||
|
296 | # repo with patches unapplied | |||
|
297 | cd qclonesource | |||
|
298 | hg qpop -a | |||
|
299 | qlog | |||
|
300 | cd .. | |||
|
301 | hg qclone qclonesource qclonedest2 | |||
|
302 | cd qclonedest2 | |||
|
303 | qlog | |||
|
304 | cd .. | |||
|
305 |
@@ -1,315 +1,338 b'' | |||||
1 | % help |
|
1 | % help | |
2 | mq extension - patch management and development |
|
2 | mq extension - patch management and development | |
3 |
|
3 | |||
4 | This extension lets you work with a stack of patches in a Mercurial |
|
4 | This extension lets you work with a stack of patches in a Mercurial | |
5 | repository. It manages two stacks of patches - all known patches, and |
|
5 | repository. It manages two stacks of patches - all known patches, and | |
6 | applied patches (subset of known patches). |
|
6 | applied patches (subset of known patches). | |
7 |
|
7 | |||
8 | Known patches are represented as patch files in the .hg/patches |
|
8 | Known patches are represented as patch files in the .hg/patches | |
9 | directory. Applied patches are both patch files and changesets. |
|
9 | directory. Applied patches are both patch files and changesets. | |
10 |
|
10 | |||
11 | Common tasks (use "hg help command" for more details): |
|
11 | Common tasks (use "hg help command" for more details): | |
12 |
|
12 | |||
13 | prepare repository to work with patches qinit |
|
13 | prepare repository to work with patches qinit | |
14 | create new patch qnew |
|
14 | create new patch qnew | |
15 | import existing patch qimport |
|
15 | import existing patch qimport | |
16 |
|
16 | |||
17 | print patch series qseries |
|
17 | print patch series qseries | |
18 | print applied patches qapplied |
|
18 | print applied patches qapplied | |
19 | print name of top applied patch qtop |
|
19 | print name of top applied patch qtop | |
20 |
|
20 | |||
21 | add known patch to applied stack qpush |
|
21 | add known patch to applied stack qpush | |
22 | remove patch from applied stack qpop |
|
22 | remove patch from applied stack qpop | |
23 | refresh contents of top applied patch qrefresh |
|
23 | refresh contents of top applied patch qrefresh | |
24 |
|
24 | |||
25 | list of commands (use "hg help -v mq" to show aliases and global options): |
|
25 | list of commands (use "hg help -v mq" to show aliases and global options): | |
26 |
|
26 | |||
27 | qapplied print the patches already applied |
|
27 | qapplied print the patches already applied | |
28 | qclone clone main and patch repository at same time |
|
28 | qclone clone main and patch repository at same time | |
29 | qcommit commit changes in the queue repository |
|
29 | qcommit commit changes in the queue repository | |
30 | qdelete remove patches from queue |
|
30 | qdelete remove patches from queue | |
31 | qdiff diff of the current patch |
|
31 | qdiff diff of the current patch | |
32 | qfold fold the named patches into the current patch |
|
32 | qfold fold the named patches into the current patch | |
33 | qguard set or print guards for a patch |
|
33 | qguard set or print guards for a patch | |
34 | qheader Print the header of the topmost or specified patch |
|
34 | qheader Print the header of the topmost or specified patch | |
35 | qimport import a patch |
|
35 | qimport import a patch | |
36 | qinit init a new queue repository |
|
36 | qinit init a new queue repository | |
37 | qnew create a new patch |
|
37 | qnew create a new patch | |
38 | qnext print the name of the next patch |
|
38 | qnext print the name of the next patch | |
39 | qpop pop the current patch off the stack |
|
39 | qpop pop the current patch off the stack | |
40 | qprev print the name of the previous patch |
|
40 | qprev print the name of the previous patch | |
41 | qpush push the next patch onto the stack |
|
41 | qpush push the next patch onto the stack | |
42 | qrefresh update the current patch |
|
42 | qrefresh update the current patch | |
43 | qrename rename a patch |
|
43 | qrename rename a patch | |
44 | qrestore restore the queue state saved by a rev |
|
44 | qrestore restore the queue state saved by a rev | |
45 | qsave save current queue state |
|
45 | qsave save current queue state | |
46 | qselect set or print guarded patches to push |
|
46 | qselect set or print guarded patches to push | |
47 | qseries print the entire series file |
|
47 | qseries print the entire series file | |
48 | qtop print the name of the current patch |
|
48 | qtop print the name of the current patch | |
49 | qunapplied print the patches not yet applied |
|
49 | qunapplied print the patches not yet applied | |
50 | strip strip a revision and all later revs on the same branch |
|
50 | strip strip a revision and all later revs on the same branch | |
51 | adding a |
|
51 | adding a | |
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 | adding b/z |
|
53 | adding b/z | |
54 | % qinit |
|
54 | % qinit | |
55 | % -R qinit |
|
55 | % -R qinit | |
56 | % qinit -c |
|
56 | % qinit -c | |
57 | A .hgignore |
|
57 | A .hgignore | |
58 | A series |
|
58 | A series | |
59 | % qnew implies add |
|
59 | % qnew implies add | |
60 | A .hgignore |
|
60 | A .hgignore | |
61 | A series |
|
61 | A series | |
62 | A test.patch |
|
62 | A test.patch | |
63 | % qnew -m |
|
63 | % qnew -m | |
64 | foo bar |
|
64 | foo bar | |
65 | % qrefresh |
|
65 | % qrefresh | |
66 | foo bar |
|
66 | foo bar | |
67 |
|
67 | |||
68 | diff -r xa |
|
68 | diff -r xa | |
69 | --- a/a |
|
69 | --- a/a | |
70 | +++ b/a |
|
70 | +++ b/a | |
71 | @@ -1,1 +1,2 @@ a |
|
71 | @@ -1,1 +1,2 @@ a | |
72 | a |
|
72 | a | |
73 | +a |
|
73 | +a | |
74 | % qpop |
|
74 | % qpop | |
75 | Patch queue now empty |
|
75 | Patch queue now empty | |
76 | % qpush |
|
76 | % qpush | |
77 | applying test.patch |
|
77 | applying test.patch | |
78 | Now at: test.patch |
|
78 | Now at: test.patch | |
79 | % pop/push outside repo |
|
79 | % pop/push outside repo | |
80 | Patch queue now empty |
|
80 | Patch queue now empty | |
81 | applying test.patch |
|
81 | applying test.patch | |
82 | Now at: test.patch |
|
82 | Now at: test.patch | |
83 | % qrefresh in subdir |
|
83 | % qrefresh in subdir | |
84 | % pop/push -a in subdir |
|
84 | % pop/push -a in subdir | |
85 | Patch queue now empty |
|
85 | Patch queue now empty | |
86 | applying test.patch |
|
86 | applying test.patch | |
87 | applying test2.patch |
|
87 | applying test2.patch | |
88 | Now at: test2.patch |
|
88 | Now at: test2.patch | |
89 | % qseries |
|
89 | % qseries | |
90 | test.patch |
|
90 | test.patch | |
91 | test2.patch |
|
91 | test2.patch | |
92 | Now at: test.patch |
|
92 | Now at: test.patch | |
93 | 0 A test.patch: foo bar |
|
93 | 0 A test.patch: foo bar | |
94 | 1 U test2.patch: |
|
94 | 1 U test2.patch: | |
95 | applying test2.patch |
|
95 | applying test2.patch | |
96 | Now at: test2.patch |
|
96 | Now at: test2.patch | |
97 | % qapplied |
|
97 | % qapplied | |
98 | test.patch |
|
98 | test.patch | |
99 | test2.patch |
|
99 | test2.patch | |
100 | % qtop |
|
100 | % qtop | |
101 | test2.patch |
|
101 | test2.patch | |
102 | % qprev |
|
102 | % qprev | |
103 | test.patch |
|
103 | test.patch | |
104 | % qnext |
|
104 | % qnext | |
105 | All patches applied |
|
105 | All patches applied | |
106 | % pop, qnext, qprev, qapplied |
|
106 | % pop, qnext, qprev, qapplied | |
107 | Now at: test.patch |
|
107 | Now at: test.patch | |
108 | test2.patch |
|
108 | test2.patch | |
109 | Only one patch applied |
|
109 | Only one patch applied | |
110 | test.patch |
|
110 | test.patch | |
111 | % commit should fail |
|
111 | % commit should fail | |
112 | abort: cannot commit over an applied mq patch |
|
112 | abort: cannot commit over an applied mq patch | |
113 | % push should fail |
|
113 | % push should fail | |
114 | pushing to ../../k |
|
114 | pushing to ../../k | |
115 | abort: source has mq patches applied |
|
115 | abort: source has mq patches applied | |
116 | % qunapplied |
|
116 | % qunapplied | |
117 | test2.patch |
|
117 | test2.patch | |
118 | % qpush/qpop with index |
|
118 | % qpush/qpop with index | |
119 | applying test2.patch |
|
119 | applying test2.patch | |
120 | Now at: test2.patch |
|
120 | Now at: test2.patch | |
121 | Now at: test.patch |
|
121 | Now at: test.patch | |
122 | applying test1b.patch |
|
122 | applying test1b.patch | |
123 | Now at: test1b.patch |
|
123 | Now at: test1b.patch | |
124 | applying test2.patch |
|
124 | applying test2.patch | |
125 | Now at: test2.patch |
|
125 | Now at: test2.patch | |
126 | Now at: test1b.patch |
|
126 | Now at: test1b.patch | |
127 | Now at: test.patch |
|
127 | Now at: test.patch | |
128 | applying test1b.patch |
|
128 | applying test1b.patch | |
129 | applying test2.patch |
|
129 | applying test2.patch | |
130 | Now at: test2.patch |
|
130 | Now at: test2.patch | |
131 | % push should succeed |
|
131 | % push should succeed | |
132 | Patch queue now empty |
|
132 | Patch queue now empty | |
133 | pushing to ../../k |
|
133 | pushing to ../../k | |
134 | searching for changes |
|
134 | searching for changes | |
135 | adding changesets |
|
135 | adding changesets | |
136 | adding manifests |
|
136 | adding manifests | |
137 | adding file changes |
|
137 | adding file changes | |
138 | added 1 changesets with 1 changes to 1 files |
|
138 | added 1 changesets with 1 changes to 1 files | |
139 | % strip |
|
139 | % strip | |
140 | adding x |
|
140 | adding x | |
141 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
141 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
142 | saving bundle to |
|
142 | saving bundle to | |
143 | adding changesets |
|
143 | adding changesets | |
144 | adding manifests |
|
144 | adding manifests | |
145 | adding file changes |
|
145 | adding file changes | |
146 | added 1 changesets with 1 changes to 1 files |
|
146 | added 1 changesets with 1 changes to 1 files | |
147 | (run 'hg update' to get a working copy) |
|
147 | (run 'hg update' to get a working copy) | |
148 | % cd b; hg qrefresh |
|
148 | % cd b; hg qrefresh | |
149 | adding a |
|
149 | adding a | |
150 | foo |
|
150 | foo | |
151 |
|
151 | |||
152 | diff -r cb9a9f314b8b a |
|
152 | diff -r cb9a9f314b8b a | |
153 | --- a/a |
|
153 | --- a/a | |
154 | +++ b/a |
|
154 | +++ b/a | |
155 | @@ -1,1 +1,2 @@ a |
|
155 | @@ -1,1 +1,2 @@ a | |
156 | a |
|
156 | a | |
157 | +a |
|
157 | +a | |
158 | diff -r cb9a9f314b8b b/f |
|
158 | diff -r cb9a9f314b8b b/f | |
159 | --- /dev/null |
|
159 | --- /dev/null | |
160 | +++ b/b/f |
|
160 | +++ b/b/f | |
161 | @@ -0,0 +1,1 @@ |
|
161 | @@ -0,0 +1,1 @@ | |
162 | +f |
|
162 | +f | |
163 | % hg qrefresh . |
|
163 | % hg qrefresh . | |
164 | foo |
|
164 | foo | |
165 |
|
165 | |||
166 | diff -r cb9a9f314b8b b/f |
|
166 | diff -r cb9a9f314b8b b/f | |
167 | --- /dev/null |
|
167 | --- /dev/null | |
168 | +++ b/b/f |
|
168 | +++ b/b/f | |
169 | @@ -0,0 +1,1 @@ |
|
169 | @@ -0,0 +1,1 @@ | |
170 | +f |
|
170 | +f | |
171 | M a |
|
171 | M a | |
172 | % qpush failure |
|
172 | % qpush failure | |
173 | Patch queue now empty |
|
173 | Patch queue now empty | |
174 | applying foo |
|
174 | applying foo | |
175 | applying bar |
|
175 | applying bar | |
176 | 1 out of 1 hunk ignored -- saving rejects to file foo.rej |
|
176 | 1 out of 1 hunk ignored -- saving rejects to file foo.rej | |
177 | patch failed, unable to continue (try -v) |
|
177 | patch failed, unable to continue (try -v) | |
178 | patch failed, rejects left in working dir |
|
178 | patch failed, rejects left in working dir | |
179 | Errors during apply, please fix and refresh bar |
|
179 | Errors during apply, please fix and refresh bar | |
180 | ? foo |
|
180 | ? foo | |
181 | ? foo.rej |
|
181 | ? foo.rej | |
182 | new file |
|
182 | new file | |
183 |
|
183 | |||
184 | diff --git a/new b/new |
|
184 | diff --git a/new b/new | |
185 | new file mode 100755 |
|
185 | new file mode 100755 | |
186 | --- /dev/null |
|
186 | --- /dev/null | |
187 | +++ b/new |
|
187 | +++ b/new | |
188 | @@ -0,0 +1,1 @@ |
|
188 | @@ -0,0 +1,1 @@ | |
189 | +foo |
|
189 | +foo | |
190 | copy file |
|
190 | copy file | |
191 |
|
191 | |||
192 | diff --git a/new b/copy |
|
192 | diff --git a/new b/copy | |
193 | copy from new |
|
193 | copy from new | |
194 | copy to copy |
|
194 | copy to copy | |
195 | Now at: new |
|
195 | Now at: new | |
196 | applying copy |
|
196 | applying copy | |
197 | Now at: copy |
|
197 | Now at: copy | |
198 | diff --git a/new b/copy |
|
198 | diff --git a/new b/copy | |
199 | copy from new |
|
199 | copy from new | |
200 | copy to copy |
|
200 | copy to copy | |
201 | diff --git a/new b/copy |
|
201 | diff --git a/new b/copy | |
202 | copy from new |
|
202 | copy from new | |
203 | copy to copy |
|
203 | copy to copy | |
204 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
204 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
205 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
205 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
206 | adding branch |
|
206 | adding branch | |
207 | adding changesets |
|
207 | adding changesets | |
208 | adding manifests |
|
208 | adding manifests | |
209 | adding file changes |
|
209 | adding file changes | |
210 | added 1 changesets with 1 changes to 1 files |
|
210 | added 1 changesets with 1 changes to 1 files | |
211 | (run 'hg update' to get a working copy) |
|
211 | (run 'hg update' to get a working copy) | |
212 | Patch queue now empty |
|
212 | Patch queue now empty | |
213 | applying bar |
|
213 | applying bar | |
214 | Now at: bar |
|
214 | Now at: bar | |
215 | diff --git a/bar b/bar |
|
215 | diff --git a/bar b/bar | |
216 | new file mode 100644 |
|
216 | new file mode 100644 | |
217 | --- /dev/null |
|
217 | --- /dev/null | |
218 | +++ b/bar |
|
218 | +++ b/bar | |
219 | @@ -0,0 +1,1 @@ |
|
219 | @@ -0,0 +1,1 @@ | |
220 | +bar |
|
220 | +bar | |
221 | diff --git a/foo b/baz |
|
221 | diff --git a/foo b/baz | |
222 | rename from foo |
|
222 | rename from foo | |
223 | rename to baz |
|
223 | rename to baz | |
224 | 2 baz (foo) |
|
224 | 2 baz (foo) | |
225 | diff --git a/bar b/bar |
|
225 | diff --git a/bar b/bar | |
226 | new file mode 100644 |
|
226 | new file mode 100644 | |
227 | --- /dev/null |
|
227 | --- /dev/null | |
228 | +++ b/bar |
|
228 | +++ b/bar | |
229 | @@ -0,0 +1,1 @@ |
|
229 | @@ -0,0 +1,1 @@ | |
230 | +bar |
|
230 | +bar | |
231 | diff --git a/foo b/baz |
|
231 | diff --git a/foo b/baz | |
232 | rename from foo |
|
232 | rename from foo | |
233 | rename to baz |
|
233 | rename to baz | |
234 | 2 baz (foo) |
|
234 | 2 baz (foo) | |
235 |
|
235 | |||
236 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
236 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
237 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
237 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
238 | adding branch |
|
238 | adding branch | |
239 | adding changesets |
|
239 | adding changesets | |
240 | adding manifests |
|
240 | adding manifests | |
241 | adding file changes |
|
241 | adding file changes | |
242 | added 1 changesets with 1 changes to 1 files |
|
242 | added 1 changesets with 1 changes to 1 files | |
243 | (run 'hg update' to get a working copy) |
|
243 | (run 'hg update' to get a working copy) | |
244 | Patch queue now empty |
|
244 | Patch queue now empty | |
245 | applying bar |
|
245 | applying bar | |
246 | Now at: bar |
|
246 | Now at: bar | |
247 | diff --git a/foo b/bleh |
|
247 | diff --git a/foo b/bleh | |
248 | rename from foo |
|
248 | rename from foo | |
249 | rename to bleh |
|
249 | rename to bleh | |
250 | diff --git a/quux b/quux |
|
250 | diff --git a/quux b/quux | |
251 | new file mode 100644 |
|
251 | new file mode 100644 | |
252 | --- /dev/null |
|
252 | --- /dev/null | |
253 | +++ b/quux |
|
253 | +++ b/quux | |
254 | @@ -0,0 +1,1 @@ |
|
254 | @@ -0,0 +1,1 @@ | |
255 | +bar |
|
255 | +bar | |
256 | 3 bleh (foo) |
|
256 | 3 bleh (foo) | |
257 | diff --git a/foo b/barney |
|
257 | diff --git a/foo b/barney | |
258 | rename from foo |
|
258 | rename from foo | |
259 | rename to barney |
|
259 | rename to barney | |
260 | diff --git a/fred b/fred |
|
260 | diff --git a/fred b/fred | |
261 | new file mode 100644 |
|
261 | new file mode 100644 | |
262 | --- /dev/null |
|
262 | --- /dev/null | |
263 | +++ b/fred |
|
263 | +++ b/fred | |
264 | @@ -0,0 +1,1 @@ |
|
264 | @@ -0,0 +1,1 @@ | |
265 | +bar |
|
265 | +bar | |
266 | 3 barney (foo) |
|
266 | 3 barney (foo) | |
267 | % strip again |
|
267 | % strip again | |
268 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
268 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
269 | merging foo |
|
269 | merging foo | |
270 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
270 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
271 | (branch merge, don't forget to commit) |
|
271 | (branch merge, don't forget to commit) | |
272 | changeset: 3:99615015637b |
|
272 | changeset: 3:99615015637b | |
273 | tag: tip |
|
273 | tag: tip | |
274 | parent: 2:20cbbe65cff7 |
|
274 | parent: 2:20cbbe65cff7 | |
275 | parent: 1:d2871fc282d4 |
|
275 | parent: 1:d2871fc282d4 | |
276 | user: test |
|
276 | user: test | |
277 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
277 | date: Thu Jan 01 00:00:00 1970 +0000 | |
278 | summary: merge |
|
278 | summary: merge | |
279 |
|
279 | |||
280 | changeset: 2:20cbbe65cff7 |
|
280 | changeset: 2:20cbbe65cff7 | |
281 | parent: 0:53245c60e682 |
|
281 | parent: 0:53245c60e682 | |
282 | user: test |
|
282 | user: test | |
283 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
283 | date: Thu Jan 01 00:00:00 1970 +0000 | |
284 | summary: change foo 2 |
|
284 | summary: change foo 2 | |
285 |
|
285 | |||
286 | changeset: 1:d2871fc282d4 |
|
286 | changeset: 1:d2871fc282d4 | |
287 | user: test |
|
287 | user: test | |
288 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
288 | date: Thu Jan 01 00:00:00 1970 +0000 | |
289 | summary: change foo 1 |
|
289 | summary: change foo 1 | |
290 |
|
290 | |||
291 | changeset: 0:53245c60e682 |
|
291 | changeset: 0:53245c60e682 | |
292 | user: test |
|
292 | user: test | |
293 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
293 | date: Thu Jan 01 00:00:00 1970 +0000 | |
294 | summary: add foo |
|
294 | summary: add foo | |
295 |
|
295 | |||
296 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
296 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
297 | saving bundle to |
|
297 | saving bundle to | |
298 | saving bundle to |
|
298 | saving bundle to | |
299 | adding branch |
|
299 | adding branch | |
300 | adding changesets |
|
300 | adding changesets | |
301 | adding manifests |
|
301 | adding manifests | |
302 | adding file changes |
|
302 | adding file changes | |
303 | added 1 changesets with 1 changes to 1 files |
|
303 | added 1 changesets with 1 changes to 1 files | |
304 | (run 'hg update' to get a working copy) |
|
304 | (run 'hg update' to get a working copy) | |
305 | changeset: 1:20cbbe65cff7 |
|
305 | changeset: 1:20cbbe65cff7 | |
306 | tag: tip |
|
306 | tag: tip | |
307 | user: test |
|
307 | user: test | |
308 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
308 | date: Thu Jan 01 00:00:00 1970 +0000 | |
309 | summary: change foo 2 |
|
309 | summary: change foo 2 | |
310 |
|
310 | |||
311 | changeset: 0:53245c60e682 |
|
311 | changeset: 0:53245c60e682 | |
312 | user: test |
|
312 | user: test | |
313 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
313 | date: Thu Jan 01 00:00:00 1970 +0000 | |
314 | summary: add foo |
|
314 | summary: add foo | |
315 |
|
315 | |||
|
316 | % qclone | |||
|
317 | main repo: | |||
|
318 | rev 1: change foo | |||
|
319 | rev 0: add foo | |||
|
320 | patch repo: | |||
|
321 | rev 0: checkpoint | |||
|
322 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
323 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
324 | main repo: | |||
|
325 | rev 0: add foo | |||
|
326 | patch repo: | |||
|
327 | rev 0: checkpoint | |||
|
328 | Patch queue now empty | |||
|
329 | main repo: | |||
|
330 | rev 0: add foo | |||
|
331 | patch repo: | |||
|
332 | rev 0: checkpoint | |||
|
333 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
334 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
335 | main repo: | |||
|
336 | rev 0: add foo | |||
|
337 | patch repo: | |||
|
338 | rev 0: checkpoint |
General Comments 0
You need to be logged in to leave comments.
Login now