Show More
@@ -1,3259 +1,3259 b'' | |||
|
1 | 1 | # patch.py - patch file parsing routines |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2006 Brendan Cully <brendan@kublai.com> |
|
4 | 4 | # Copyright 2007 Chris Mason <chris.mason@oracle.com> |
|
5 | 5 | # |
|
6 | 6 | # This software may be used and distributed according to the terms of the |
|
7 | 7 | # GNU General Public License version 2 or any later version. |
|
8 | 8 | |
|
9 | 9 | from __future__ import absolute_import, print_function |
|
10 | 10 | |
|
11 | 11 | import collections |
|
12 | 12 | import contextlib |
|
13 | 13 | import copy |
|
14 | 14 | import errno |
|
15 | 15 | import os |
|
16 | 16 | import re |
|
17 | 17 | import shutil |
|
18 | 18 | import zlib |
|
19 | 19 | |
|
20 | 20 | from .i18n import _ |
|
21 | 21 | from .node import ( |
|
22 | 22 | hex, |
|
23 | 23 | short, |
|
24 | 24 | ) |
|
25 | 25 | from .pycompat import open |
|
26 | 26 | from . import ( |
|
27 | 27 | copies, |
|
28 | 28 | diffhelper, |
|
29 | 29 | diffutil, |
|
30 | 30 | encoding, |
|
31 | 31 | error, |
|
32 | 32 | mail, |
|
33 | 33 | mdiff, |
|
34 | 34 | pathutil, |
|
35 | 35 | pycompat, |
|
36 | 36 | scmutil, |
|
37 | 37 | similar, |
|
38 | 38 | util, |
|
39 | 39 | vfs as vfsmod, |
|
40 | 40 | ) |
|
41 | 41 | from .utils import ( |
|
42 | 42 | dateutil, |
|
43 | 43 | hashutil, |
|
44 | 44 | procutil, |
|
45 | 45 | stringutil, |
|
46 | 46 | ) |
|
47 | 47 | |
|
48 | 48 | stringio = util.stringio |
|
49 | 49 | |
|
50 | 50 | gitre = re.compile(br'diff --git a/(.*) b/(.*)') |
|
51 | 51 | tabsplitter = re.compile(br'(\t+|[^\t]+)') |
|
52 | 52 | wordsplitter = re.compile( |
|
53 | 53 | br'(\t+| +|[a-zA-Z0-9_\x80-\xff]+|[^ \ta-zA-Z0-9_\x80-\xff])' |
|
54 | 54 | ) |
|
55 | 55 | |
|
56 | 56 | PatchError = error.PatchError |
|
57 | 57 | |
|
58 | 58 | # public functions |
|
59 | 59 | |
|
60 | 60 | |
|
61 | 61 | def split(stream): |
|
62 | 62 | '''return an iterator of individual patches from a stream''' |
|
63 | 63 | |
|
64 | 64 | def isheader(line, inheader): |
|
65 | 65 | if inheader and line.startswith((b' ', b'\t')): |
|
66 | 66 | # continuation |
|
67 | 67 | return True |
|
68 | 68 | if line.startswith((b' ', b'-', b'+')): |
|
69 | 69 | # diff line - don't check for header pattern in there |
|
70 | 70 | return False |
|
71 | 71 | l = line.split(b': ', 1) |
|
72 | 72 | return len(l) == 2 and b' ' not in l[0] |
|
73 | 73 | |
|
74 | 74 | def chunk(lines): |
|
75 | 75 | return stringio(b''.join(lines)) |
|
76 | 76 | |
|
77 | 77 | def hgsplit(stream, cur): |
|
78 | 78 | inheader = True |
|
79 | 79 | |
|
80 | 80 | for line in stream: |
|
81 | 81 | if not line.strip(): |
|
82 | 82 | inheader = False |
|
83 | 83 | if not inheader and line.startswith(b'# HG changeset patch'): |
|
84 | 84 | yield chunk(cur) |
|
85 | 85 | cur = [] |
|
86 | 86 | inheader = True |
|
87 | 87 | |
|
88 | 88 | cur.append(line) |
|
89 | 89 | |
|
90 | 90 | if cur: |
|
91 | 91 | yield chunk(cur) |
|
92 | 92 | |
|
93 | 93 | def mboxsplit(stream, cur): |
|
94 | 94 | for line in stream: |
|
95 | 95 | if line.startswith(b'From '): |
|
96 | 96 | for c in split(chunk(cur[1:])): |
|
97 | 97 | yield c |
|
98 | 98 | cur = [] |
|
99 | 99 | |
|
100 | 100 | cur.append(line) |
|
101 | 101 | |
|
102 | 102 | if cur: |
|
103 | 103 | for c in split(chunk(cur[1:])): |
|
104 | 104 | yield c |
|
105 | 105 | |
|
106 | 106 | def mimesplit(stream, cur): |
|
107 | 107 | def msgfp(m): |
|
108 | 108 | fp = stringio() |
|
109 | 109 | g = mail.Generator(fp, mangle_from_=False) |
|
110 | 110 | g.flatten(m) |
|
111 | 111 | fp.seek(0) |
|
112 | 112 | return fp |
|
113 | 113 | |
|
114 | 114 | for line in stream: |
|
115 | 115 | cur.append(line) |
|
116 | 116 | c = chunk(cur) |
|
117 | 117 | |
|
118 | 118 | m = mail.parse(c) |
|
119 | 119 | if not m.is_multipart(): |
|
120 | 120 | yield msgfp(m) |
|
121 | 121 | else: |
|
122 | 122 | ok_types = (b'text/plain', b'text/x-diff', b'text/x-patch') |
|
123 | 123 | for part in m.walk(): |
|
124 | 124 | ct = part.get_content_type() |
|
125 | 125 | if ct not in ok_types: |
|
126 | 126 | continue |
|
127 | 127 | yield msgfp(part) |
|
128 | 128 | |
|
129 | 129 | def headersplit(stream, cur): |
|
130 | 130 | inheader = False |
|
131 | 131 | |
|
132 | 132 | for line in stream: |
|
133 | 133 | if not inheader and isheader(line, inheader): |
|
134 | 134 | yield chunk(cur) |
|
135 | 135 | cur = [] |
|
136 | 136 | inheader = True |
|
137 | 137 | if inheader and not isheader(line, inheader): |
|
138 | 138 | inheader = False |
|
139 | 139 | |
|
140 | 140 | cur.append(line) |
|
141 | 141 | |
|
142 | 142 | if cur: |
|
143 | 143 | yield chunk(cur) |
|
144 | 144 | |
|
145 | 145 | def remainder(cur): |
|
146 | 146 | yield chunk(cur) |
|
147 | 147 | |
|
148 | 148 | class fiter(object): |
|
149 | 149 | def __init__(self, fp): |
|
150 | 150 | self.fp = fp |
|
151 | 151 | |
|
152 | 152 | def __iter__(self): |
|
153 | 153 | return self |
|
154 | 154 | |
|
155 | 155 | def next(self): |
|
156 | 156 | l = self.fp.readline() |
|
157 | 157 | if not l: |
|
158 | 158 | raise StopIteration |
|
159 | 159 | return l |
|
160 | 160 | |
|
161 | 161 | __next__ = next |
|
162 | 162 | |
|
163 | 163 | inheader = False |
|
164 | 164 | cur = [] |
|
165 | 165 | |
|
166 | 166 | mimeheaders = [b'content-type'] |
|
167 | 167 | |
|
168 | 168 | if not util.safehasattr(stream, b'next'): |
|
169 | 169 | # http responses, for example, have readline but not next |
|
170 | 170 | stream = fiter(stream) |
|
171 | 171 | |
|
172 | 172 | for line in stream: |
|
173 | 173 | cur.append(line) |
|
174 | 174 | if line.startswith(b'# HG changeset patch'): |
|
175 | 175 | return hgsplit(stream, cur) |
|
176 | 176 | elif line.startswith(b'From '): |
|
177 | 177 | return mboxsplit(stream, cur) |
|
178 | 178 | elif isheader(line, inheader): |
|
179 | 179 | inheader = True |
|
180 | 180 | if line.split(b':', 1)[0].lower() in mimeheaders: |
|
181 | 181 | # let email parser handle this |
|
182 | 182 | return mimesplit(stream, cur) |
|
183 | 183 | elif line.startswith(b'--- ') and inheader: |
|
184 | 184 | # No evil headers seen by diff start, split by hand |
|
185 | 185 | return headersplit(stream, cur) |
|
186 | 186 | # Not enough info, keep reading |
|
187 | 187 | |
|
188 | 188 | # if we are here, we have a very plain patch |
|
189 | 189 | return remainder(cur) |
|
190 | 190 | |
|
191 | 191 | |
|
192 | 192 | ## Some facility for extensible patch parsing: |
|
193 | 193 | # list of pairs ("header to match", "data key") |
|
194 | 194 | patchheadermap = [ |
|
195 | 195 | (b'Date', b'date'), |
|
196 | 196 | (b'Branch', b'branch'), |
|
197 | 197 | (b'Node ID', b'nodeid'), |
|
198 | 198 | ] |
|
199 | 199 | |
|
200 | 200 | |
|
201 | 201 | @contextlib.contextmanager |
|
202 | 202 | def extract(ui, fileobj): |
|
203 | 203 | """extract patch from data read from fileobj. |
|
204 | 204 | |
|
205 | 205 | patch can be a normal patch or contained in an email message. |
|
206 | 206 | |
|
207 | 207 | return a dictionary. Standard keys are: |
|
208 | 208 | - filename, |
|
209 | 209 | - message, |
|
210 | 210 | - user, |
|
211 | 211 | - date, |
|
212 | 212 | - branch, |
|
213 | 213 | - node, |
|
214 | 214 | - p1, |
|
215 | 215 | - p2. |
|
216 | 216 | Any item can be missing from the dictionary. If filename is missing, |
|
217 | 217 | fileobj did not contain a patch. Caller must unlink filename when done.""" |
|
218 | 218 | |
|
219 | 219 | fd, tmpname = pycompat.mkstemp(prefix=b'hg-patch-') |
|
220 | 220 | tmpfp = os.fdopen(fd, 'wb') |
|
221 | 221 | try: |
|
222 | 222 | yield _extract(ui, fileobj, tmpname, tmpfp) |
|
223 | 223 | finally: |
|
224 | 224 | tmpfp.close() |
|
225 | 225 | os.unlink(tmpname) |
|
226 | 226 | |
|
227 | 227 | |
|
228 | 228 | def _extract(ui, fileobj, tmpname, tmpfp): |
|
229 | 229 | |
|
230 | 230 | # attempt to detect the start of a patch |
|
231 | 231 | # (this heuristic is borrowed from quilt) |
|
232 | 232 | diffre = re.compile( |
|
233 | 233 | br'^(?:Index:[ \t]|diff[ \t]-|RCS file: |' |
|
234 | 234 | br'retrieving revision [0-9]+(\.[0-9]+)*$|' |
|
235 | 235 | br'---[ \t].*?^\+\+\+[ \t]|' |
|
236 | 236 | br'\*\*\*[ \t].*?^---[ \t])', |
|
237 | 237 | re.MULTILINE | re.DOTALL, |
|
238 | 238 | ) |
|
239 | 239 | |
|
240 | 240 | data = {} |
|
241 | 241 | |
|
242 | 242 | msg = mail.parse(fileobj) |
|
243 | 243 | |
|
244 | 244 | subject = msg['Subject'] and mail.headdecode(msg['Subject']) |
|
245 | 245 | data[b'user'] = msg['From'] and mail.headdecode(msg['From']) |
|
246 | 246 | if not subject and not data[b'user']: |
|
247 | 247 | # Not an email, restore parsed headers if any |
|
248 | 248 | subject = ( |
|
249 | 249 | b'\n'.join( |
|
250 | 250 | b': '.join(map(encoding.strtolocal, h)) for h in msg.items() |
|
251 | 251 | ) |
|
252 | 252 | + b'\n' |
|
253 | 253 | ) |
|
254 | 254 | |
|
255 | 255 | # should try to parse msg['Date'] |
|
256 | 256 | parents = [] |
|
257 | 257 | |
|
258 | 258 | nodeid = msg['X-Mercurial-Node'] |
|
259 | 259 | if nodeid: |
|
260 | 260 | data[b'nodeid'] = nodeid = mail.headdecode(nodeid) |
|
261 | 261 | ui.debug(b'Node ID: %s\n' % nodeid) |
|
262 | 262 | |
|
263 | 263 | if subject: |
|
264 | 264 | if subject.startswith(b'[PATCH'): |
|
265 | 265 | pend = subject.find(b']') |
|
266 | 266 | if pend >= 0: |
|
267 | 267 | subject = subject[pend + 1 :].lstrip() |
|
268 | 268 | subject = re.sub(br'\n[ \t]+', b' ', subject) |
|
269 | 269 | ui.debug(b'Subject: %s\n' % subject) |
|
270 | 270 | if data[b'user']: |
|
271 | 271 | ui.debug(b'From: %s\n' % data[b'user']) |
|
272 | 272 | diffs_seen = 0 |
|
273 | 273 | ok_types = (b'text/plain', b'text/x-diff', b'text/x-patch') |
|
274 | 274 | message = b'' |
|
275 | 275 | for part in msg.walk(): |
|
276 | 276 | content_type = pycompat.bytestr(part.get_content_type()) |
|
277 | 277 | ui.debug(b'Content-Type: %s\n' % content_type) |
|
278 | 278 | if content_type not in ok_types: |
|
279 | 279 | continue |
|
280 | 280 | payload = part.get_payload(decode=True) |
|
281 | 281 | m = diffre.search(payload) |
|
282 | 282 | if m: |
|
283 | 283 | hgpatch = False |
|
284 | 284 | hgpatchheader = False |
|
285 | 285 | ignoretext = False |
|
286 | 286 | |
|
287 | 287 | ui.debug(b'found patch at byte %d\n' % m.start(0)) |
|
288 | 288 | diffs_seen += 1 |
|
289 | 289 | cfp = stringio() |
|
290 | 290 | for line in payload[: m.start(0)].splitlines(): |
|
291 | 291 | if line.startswith(b'# HG changeset patch') and not hgpatch: |
|
292 | 292 | ui.debug(b'patch generated by hg export\n') |
|
293 | 293 | hgpatch = True |
|
294 | 294 | hgpatchheader = True |
|
295 | 295 | # drop earlier commit message content |
|
296 | 296 | cfp.seek(0) |
|
297 | 297 | cfp.truncate() |
|
298 | 298 | subject = None |
|
299 | 299 | elif hgpatchheader: |
|
300 | 300 | if line.startswith(b'# User '): |
|
301 | 301 | data[b'user'] = line[7:] |
|
302 | 302 | ui.debug(b'From: %s\n' % data[b'user']) |
|
303 | 303 | elif line.startswith(b"# Parent "): |
|
304 | 304 | parents.append(line[9:].lstrip()) |
|
305 | 305 | elif line.startswith(b"# "): |
|
306 | 306 | for header, key in patchheadermap: |
|
307 | 307 | prefix = b'# %s ' % header |
|
308 | 308 | if line.startswith(prefix): |
|
309 | 309 | data[key] = line[len(prefix) :] |
|
310 | 310 | ui.debug(b'%s: %s\n' % (header, data[key])) |
|
311 | 311 | else: |
|
312 | 312 | hgpatchheader = False |
|
313 | 313 | elif line == b'---': |
|
314 | 314 | ignoretext = True |
|
315 | 315 | if not hgpatchheader and not ignoretext: |
|
316 | 316 | cfp.write(line) |
|
317 | 317 | cfp.write(b'\n') |
|
318 | 318 | message = cfp.getvalue() |
|
319 | 319 | if tmpfp: |
|
320 | 320 | tmpfp.write(payload) |
|
321 | 321 | if not payload.endswith(b'\n'): |
|
322 | 322 | tmpfp.write(b'\n') |
|
323 | 323 | elif not diffs_seen and message and content_type == b'text/plain': |
|
324 | 324 | message += b'\n' + payload |
|
325 | 325 | |
|
326 | 326 | if subject and not message.startswith(subject): |
|
327 | 327 | message = b'%s\n%s' % (subject, message) |
|
328 | 328 | data[b'message'] = message |
|
329 | 329 | tmpfp.close() |
|
330 | 330 | if parents: |
|
331 | 331 | data[b'p1'] = parents.pop(0) |
|
332 | 332 | if parents: |
|
333 | 333 | data[b'p2'] = parents.pop(0) |
|
334 | 334 | |
|
335 | 335 | if diffs_seen: |
|
336 | 336 | data[b'filename'] = tmpname |
|
337 | 337 | |
|
338 | 338 | return data |
|
339 | 339 | |
|
340 | 340 | |
|
341 | 341 | class patchmeta(object): |
|
342 | 342 | """Patched file metadata |
|
343 | 343 | |
|
344 | 344 | 'op' is the performed operation within ADD, DELETE, RENAME, MODIFY |
|
345 | 345 | or COPY. 'path' is patched file path. 'oldpath' is set to the |
|
346 | 346 | origin file when 'op' is either COPY or RENAME, None otherwise. If |
|
347 | 347 | file mode is changed, 'mode' is a tuple (islink, isexec) where |
|
348 | 348 | 'islink' is True if the file is a symlink and 'isexec' is True if |
|
349 | 349 | the file is executable. Otherwise, 'mode' is None. |
|
350 | 350 | """ |
|
351 | 351 | |
|
352 | 352 | def __init__(self, path): |
|
353 | 353 | self.path = path |
|
354 | 354 | self.oldpath = None |
|
355 | 355 | self.mode = None |
|
356 | 356 | self.op = b'MODIFY' |
|
357 | 357 | self.binary = False |
|
358 | 358 | |
|
359 | 359 | def setmode(self, mode): |
|
360 | 360 | islink = mode & 0o20000 |
|
361 | 361 | isexec = mode & 0o100 |
|
362 | 362 | self.mode = (islink, isexec) |
|
363 | 363 | |
|
364 | 364 | def copy(self): |
|
365 | 365 | other = patchmeta(self.path) |
|
366 | 366 | other.oldpath = self.oldpath |
|
367 | 367 | other.mode = self.mode |
|
368 | 368 | other.op = self.op |
|
369 | 369 | other.binary = self.binary |
|
370 | 370 | return other |
|
371 | 371 | |
|
372 | 372 | def _ispatchinga(self, afile): |
|
373 | 373 | if afile == b'/dev/null': |
|
374 | 374 | return self.op == b'ADD' |
|
375 | 375 | return afile == b'a/' + (self.oldpath or self.path) |
|
376 | 376 | |
|
377 | 377 | def _ispatchingb(self, bfile): |
|
378 | 378 | if bfile == b'/dev/null': |
|
379 | 379 | return self.op == b'DELETE' |
|
380 | 380 | return bfile == b'b/' + self.path |
|
381 | 381 | |
|
382 | 382 | def ispatching(self, afile, bfile): |
|
383 | 383 | return self._ispatchinga(afile) and self._ispatchingb(bfile) |
|
384 | 384 | |
|
385 | 385 | def __repr__(self): |
|
386 | 386 | return "<patchmeta %s %r>" % (self.op, self.path) |
|
387 | 387 | |
|
388 | 388 | |
|
389 | 389 | def readgitpatch(lr): |
|
390 | 390 | """extract git-style metadata about patches from <patchname>""" |
|
391 | 391 | |
|
392 | 392 | # Filter patch for git information |
|
393 | 393 | gp = None |
|
394 | 394 | gitpatches = [] |
|
395 | 395 | for line in lr: |
|
396 |
line = line.rstrip(b' |
|
|
396 | line = line.rstrip(b'\r\n') | |
|
397 | 397 | if line.startswith(b'diff --git a/'): |
|
398 | 398 | m = gitre.match(line) |
|
399 | 399 | if m: |
|
400 | 400 | if gp: |
|
401 | 401 | gitpatches.append(gp) |
|
402 | 402 | dst = m.group(2) |
|
403 | 403 | gp = patchmeta(dst) |
|
404 | 404 | elif gp: |
|
405 | 405 | if line.startswith(b'--- '): |
|
406 | 406 | gitpatches.append(gp) |
|
407 | 407 | gp = None |
|
408 | 408 | continue |
|
409 | 409 | if line.startswith(b'rename from '): |
|
410 | 410 | gp.op = b'RENAME' |
|
411 | 411 | gp.oldpath = line[12:] |
|
412 | 412 | elif line.startswith(b'rename to '): |
|
413 | 413 | gp.path = line[10:] |
|
414 | 414 | elif line.startswith(b'copy from '): |
|
415 | 415 | gp.op = b'COPY' |
|
416 | 416 | gp.oldpath = line[10:] |
|
417 | 417 | elif line.startswith(b'copy to '): |
|
418 | 418 | gp.path = line[8:] |
|
419 | 419 | elif line.startswith(b'deleted file'): |
|
420 | 420 | gp.op = b'DELETE' |
|
421 | 421 | elif line.startswith(b'new file mode '): |
|
422 | 422 | gp.op = b'ADD' |
|
423 | 423 | gp.setmode(int(line[-6:], 8)) |
|
424 | 424 | elif line.startswith(b'new mode '): |
|
425 | 425 | gp.setmode(int(line[-6:], 8)) |
|
426 | 426 | elif line.startswith(b'GIT binary patch'): |
|
427 | 427 | gp.binary = True |
|
428 | 428 | if gp: |
|
429 | 429 | gitpatches.append(gp) |
|
430 | 430 | |
|
431 | 431 | return gitpatches |
|
432 | 432 | |
|
433 | 433 | |
|
434 | 434 | class linereader(object): |
|
435 | 435 | # simple class to allow pushing lines back into the input stream |
|
436 | 436 | def __init__(self, fp): |
|
437 | 437 | self.fp = fp |
|
438 | 438 | self.buf = [] |
|
439 | 439 | |
|
440 | 440 | def push(self, line): |
|
441 | 441 | if line is not None: |
|
442 | 442 | self.buf.append(line) |
|
443 | 443 | |
|
444 | 444 | def readline(self): |
|
445 | 445 | if self.buf: |
|
446 | 446 | l = self.buf[0] |
|
447 | 447 | del self.buf[0] |
|
448 | 448 | return l |
|
449 | 449 | return self.fp.readline() |
|
450 | 450 | |
|
451 | 451 | def __iter__(self): |
|
452 | 452 | return iter(self.readline, b'') |
|
453 | 453 | |
|
454 | 454 | |
|
455 | 455 | class abstractbackend(object): |
|
456 | 456 | def __init__(self, ui): |
|
457 | 457 | self.ui = ui |
|
458 | 458 | |
|
459 | 459 | def getfile(self, fname): |
|
460 | 460 | """Return target file data and flags as a (data, (islink, |
|
461 | 461 | isexec)) tuple. Data is None if file is missing/deleted. |
|
462 | 462 | """ |
|
463 | 463 | raise NotImplementedError |
|
464 | 464 | |
|
465 | 465 | def setfile(self, fname, data, mode, copysource): |
|
466 | 466 | """Write data to target file fname and set its mode. mode is a |
|
467 | 467 | (islink, isexec) tuple. If data is None, the file content should |
|
468 | 468 | be left unchanged. If the file is modified after being copied, |
|
469 | 469 | copysource is set to the original file name. |
|
470 | 470 | """ |
|
471 | 471 | raise NotImplementedError |
|
472 | 472 | |
|
473 | 473 | def unlink(self, fname): |
|
474 | 474 | """Unlink target file.""" |
|
475 | 475 | raise NotImplementedError |
|
476 | 476 | |
|
477 | 477 | def writerej(self, fname, failed, total, lines): |
|
478 | 478 | """Write rejected lines for fname. total is the number of hunks |
|
479 | 479 | which failed to apply and total the total number of hunks for this |
|
480 | 480 | files. |
|
481 | 481 | """ |
|
482 | 482 | |
|
483 | 483 | def exists(self, fname): |
|
484 | 484 | raise NotImplementedError |
|
485 | 485 | |
|
486 | 486 | def close(self): |
|
487 | 487 | raise NotImplementedError |
|
488 | 488 | |
|
489 | 489 | |
|
490 | 490 | class fsbackend(abstractbackend): |
|
491 | 491 | def __init__(self, ui, basedir): |
|
492 | 492 | super(fsbackend, self).__init__(ui) |
|
493 | 493 | self.opener = vfsmod.vfs(basedir) |
|
494 | 494 | |
|
495 | 495 | def getfile(self, fname): |
|
496 | 496 | if self.opener.islink(fname): |
|
497 | 497 | return (self.opener.readlink(fname), (True, False)) |
|
498 | 498 | |
|
499 | 499 | isexec = False |
|
500 | 500 | try: |
|
501 | 501 | isexec = self.opener.lstat(fname).st_mode & 0o100 != 0 |
|
502 | 502 | except OSError as e: |
|
503 | 503 | if e.errno != errno.ENOENT: |
|
504 | 504 | raise |
|
505 | 505 | try: |
|
506 | 506 | return (self.opener.read(fname), (False, isexec)) |
|
507 | 507 | except IOError as e: |
|
508 | 508 | if e.errno != errno.ENOENT: |
|
509 | 509 | raise |
|
510 | 510 | return None, None |
|
511 | 511 | |
|
512 | 512 | def setfile(self, fname, data, mode, copysource): |
|
513 | 513 | islink, isexec = mode |
|
514 | 514 | if data is None: |
|
515 | 515 | self.opener.setflags(fname, islink, isexec) |
|
516 | 516 | return |
|
517 | 517 | if islink: |
|
518 | 518 | self.opener.symlink(data, fname) |
|
519 | 519 | else: |
|
520 | 520 | self.opener.write(fname, data) |
|
521 | 521 | if isexec: |
|
522 | 522 | self.opener.setflags(fname, False, True) |
|
523 | 523 | |
|
524 | 524 | def unlink(self, fname): |
|
525 | 525 | rmdir = self.ui.configbool(b'experimental', b'removeemptydirs') |
|
526 | 526 | self.opener.unlinkpath(fname, ignoremissing=True, rmdir=rmdir) |
|
527 | 527 | |
|
528 | 528 | def writerej(self, fname, failed, total, lines): |
|
529 | 529 | fname = fname + b".rej" |
|
530 | 530 | self.ui.warn( |
|
531 | 531 | _(b"%d out of %d hunks FAILED -- saving rejects to file %s\n") |
|
532 | 532 | % (failed, total, fname) |
|
533 | 533 | ) |
|
534 | 534 | fp = self.opener(fname, b'w') |
|
535 | 535 | fp.writelines(lines) |
|
536 | 536 | fp.close() |
|
537 | 537 | |
|
538 | 538 | def exists(self, fname): |
|
539 | 539 | return self.opener.lexists(fname) |
|
540 | 540 | |
|
541 | 541 | |
|
542 | 542 | class workingbackend(fsbackend): |
|
543 | 543 | def __init__(self, ui, repo, similarity): |
|
544 | 544 | super(workingbackend, self).__init__(ui, repo.root) |
|
545 | 545 | self.repo = repo |
|
546 | 546 | self.similarity = similarity |
|
547 | 547 | self.removed = set() |
|
548 | 548 | self.changed = set() |
|
549 | 549 | self.copied = [] |
|
550 | 550 | |
|
551 | 551 | def _checkknown(self, fname): |
|
552 | 552 | if self.repo.dirstate[fname] == b'?' and self.exists(fname): |
|
553 | 553 | raise PatchError(_(b'cannot patch %s: file is not tracked') % fname) |
|
554 | 554 | |
|
555 | 555 | def setfile(self, fname, data, mode, copysource): |
|
556 | 556 | self._checkknown(fname) |
|
557 | 557 | super(workingbackend, self).setfile(fname, data, mode, copysource) |
|
558 | 558 | if copysource is not None: |
|
559 | 559 | self.copied.append((copysource, fname)) |
|
560 | 560 | self.changed.add(fname) |
|
561 | 561 | |
|
562 | 562 | def unlink(self, fname): |
|
563 | 563 | self._checkknown(fname) |
|
564 | 564 | super(workingbackend, self).unlink(fname) |
|
565 | 565 | self.removed.add(fname) |
|
566 | 566 | self.changed.add(fname) |
|
567 | 567 | |
|
568 | 568 | def close(self): |
|
569 | 569 | wctx = self.repo[None] |
|
570 | 570 | changed = set(self.changed) |
|
571 | 571 | for src, dst in self.copied: |
|
572 | 572 | scmutil.dirstatecopy(self.ui, self.repo, wctx, src, dst) |
|
573 | 573 | if self.removed: |
|
574 | 574 | wctx.forget(sorted(self.removed)) |
|
575 | 575 | for f in self.removed: |
|
576 | 576 | if f not in self.repo.dirstate: |
|
577 | 577 | # File was deleted and no longer belongs to the |
|
578 | 578 | # dirstate, it was probably marked added then |
|
579 | 579 | # deleted, and should not be considered by |
|
580 | 580 | # marktouched(). |
|
581 | 581 | changed.discard(f) |
|
582 | 582 | if changed: |
|
583 | 583 | scmutil.marktouched(self.repo, changed, self.similarity) |
|
584 | 584 | return sorted(self.changed) |
|
585 | 585 | |
|
586 | 586 | |
|
587 | 587 | class filestore(object): |
|
588 | 588 | def __init__(self, maxsize=None): |
|
589 | 589 | self.opener = None |
|
590 | 590 | self.files = {} |
|
591 | 591 | self.created = 0 |
|
592 | 592 | self.maxsize = maxsize |
|
593 | 593 | if self.maxsize is None: |
|
594 | 594 | self.maxsize = 4 * (2 ** 20) |
|
595 | 595 | self.size = 0 |
|
596 | 596 | self.data = {} |
|
597 | 597 | |
|
598 | 598 | def setfile(self, fname, data, mode, copied=None): |
|
599 | 599 | if self.maxsize < 0 or (len(data) + self.size) <= self.maxsize: |
|
600 | 600 | self.data[fname] = (data, mode, copied) |
|
601 | 601 | self.size += len(data) |
|
602 | 602 | else: |
|
603 | 603 | if self.opener is None: |
|
604 | 604 | root = pycompat.mkdtemp(prefix=b'hg-patch-') |
|
605 | 605 | self.opener = vfsmod.vfs(root) |
|
606 | 606 | # Avoid filename issues with these simple names |
|
607 | 607 | fn = b'%d' % self.created |
|
608 | 608 | self.opener.write(fn, data) |
|
609 | 609 | self.created += 1 |
|
610 | 610 | self.files[fname] = (fn, mode, copied) |
|
611 | 611 | |
|
612 | 612 | def getfile(self, fname): |
|
613 | 613 | if fname in self.data: |
|
614 | 614 | return self.data[fname] |
|
615 | 615 | if not self.opener or fname not in self.files: |
|
616 | 616 | return None, None, None |
|
617 | 617 | fn, mode, copied = self.files[fname] |
|
618 | 618 | return self.opener.read(fn), mode, copied |
|
619 | 619 | |
|
620 | 620 | def close(self): |
|
621 | 621 | if self.opener: |
|
622 | 622 | shutil.rmtree(self.opener.base) |
|
623 | 623 | |
|
624 | 624 | |
|
625 | 625 | class repobackend(abstractbackend): |
|
626 | 626 | def __init__(self, ui, repo, ctx, store): |
|
627 | 627 | super(repobackend, self).__init__(ui) |
|
628 | 628 | self.repo = repo |
|
629 | 629 | self.ctx = ctx |
|
630 | 630 | self.store = store |
|
631 | 631 | self.changed = set() |
|
632 | 632 | self.removed = set() |
|
633 | 633 | self.copied = {} |
|
634 | 634 | |
|
635 | 635 | def _checkknown(self, fname): |
|
636 | 636 | if fname not in self.ctx: |
|
637 | 637 | raise PatchError(_(b'cannot patch %s: file is not tracked') % fname) |
|
638 | 638 | |
|
639 | 639 | def getfile(self, fname): |
|
640 | 640 | try: |
|
641 | 641 | fctx = self.ctx[fname] |
|
642 | 642 | except error.LookupError: |
|
643 | 643 | return None, None |
|
644 | 644 | flags = fctx.flags() |
|
645 | 645 | return fctx.data(), (b'l' in flags, b'x' in flags) |
|
646 | 646 | |
|
647 | 647 | def setfile(self, fname, data, mode, copysource): |
|
648 | 648 | if copysource: |
|
649 | 649 | self._checkknown(copysource) |
|
650 | 650 | if data is None: |
|
651 | 651 | data = self.ctx[fname].data() |
|
652 | 652 | self.store.setfile(fname, data, mode, copysource) |
|
653 | 653 | self.changed.add(fname) |
|
654 | 654 | if copysource: |
|
655 | 655 | self.copied[fname] = copysource |
|
656 | 656 | |
|
657 | 657 | def unlink(self, fname): |
|
658 | 658 | self._checkknown(fname) |
|
659 | 659 | self.removed.add(fname) |
|
660 | 660 | |
|
661 | 661 | def exists(self, fname): |
|
662 | 662 | return fname in self.ctx |
|
663 | 663 | |
|
664 | 664 | def close(self): |
|
665 | 665 | return self.changed | self.removed |
|
666 | 666 | |
|
667 | 667 | |
|
668 | 668 | # @@ -start,len +start,len @@ or @@ -start +start @@ if len is 1 |
|
669 | 669 | unidesc = re.compile(br'@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@') |
|
670 | 670 | contextdesc = re.compile(br'(?:---|\*\*\*) (\d+)(?:,(\d+))? (?:---|\*\*\*)') |
|
671 | 671 | eolmodes = [b'strict', b'crlf', b'lf', b'auto'] |
|
672 | 672 | |
|
673 | 673 | |
|
674 | 674 | class patchfile(object): |
|
675 | 675 | def __init__(self, ui, gp, backend, store, eolmode=b'strict'): |
|
676 | 676 | self.fname = gp.path |
|
677 | 677 | self.eolmode = eolmode |
|
678 | 678 | self.eol = None |
|
679 | 679 | self.backend = backend |
|
680 | 680 | self.ui = ui |
|
681 | 681 | self.lines = [] |
|
682 | 682 | self.exists = False |
|
683 | 683 | self.missing = True |
|
684 | 684 | self.mode = gp.mode |
|
685 | 685 | self.copysource = gp.oldpath |
|
686 | 686 | self.create = gp.op in (b'ADD', b'COPY', b'RENAME') |
|
687 | 687 | self.remove = gp.op == b'DELETE' |
|
688 | 688 | if self.copysource is None: |
|
689 | 689 | data, mode = backend.getfile(self.fname) |
|
690 | 690 | else: |
|
691 | 691 | data, mode = store.getfile(self.copysource)[:2] |
|
692 | 692 | if data is not None: |
|
693 | 693 | self.exists = self.copysource is None or backend.exists(self.fname) |
|
694 | 694 | self.missing = False |
|
695 | 695 | if data: |
|
696 | 696 | self.lines = mdiff.splitnewlines(data) |
|
697 | 697 | if self.mode is None: |
|
698 | 698 | self.mode = mode |
|
699 | 699 | if self.lines: |
|
700 | 700 | # Normalize line endings |
|
701 | 701 | if self.lines[0].endswith(b'\r\n'): |
|
702 | 702 | self.eol = b'\r\n' |
|
703 | 703 | elif self.lines[0].endswith(b'\n'): |
|
704 | 704 | self.eol = b'\n' |
|
705 | 705 | if eolmode != b'strict': |
|
706 | 706 | nlines = [] |
|
707 | 707 | for l in self.lines: |
|
708 | 708 | if l.endswith(b'\r\n'): |
|
709 | 709 | l = l[:-2] + b'\n' |
|
710 | 710 | nlines.append(l) |
|
711 | 711 | self.lines = nlines |
|
712 | 712 | else: |
|
713 | 713 | if self.create: |
|
714 | 714 | self.missing = False |
|
715 | 715 | if self.mode is None: |
|
716 | 716 | self.mode = (False, False) |
|
717 | 717 | if self.missing: |
|
718 | 718 | self.ui.warn(_(b"unable to find '%s' for patching\n") % self.fname) |
|
719 | 719 | self.ui.warn( |
|
720 | 720 | _( |
|
721 | 721 | b"(use '--prefix' to apply patch relative to the " |
|
722 | 722 | b"current directory)\n" |
|
723 | 723 | ) |
|
724 | 724 | ) |
|
725 | 725 | |
|
726 | 726 | self.hash = {} |
|
727 | 727 | self.dirty = 0 |
|
728 | 728 | self.offset = 0 |
|
729 | 729 | self.skew = 0 |
|
730 | 730 | self.rej = [] |
|
731 | 731 | self.fileprinted = False |
|
732 | 732 | self.printfile(False) |
|
733 | 733 | self.hunks = 0 |
|
734 | 734 | |
|
735 | 735 | def writelines(self, fname, lines, mode): |
|
736 | 736 | if self.eolmode == b'auto': |
|
737 | 737 | eol = self.eol |
|
738 | 738 | elif self.eolmode == b'crlf': |
|
739 | 739 | eol = b'\r\n' |
|
740 | 740 | else: |
|
741 | 741 | eol = b'\n' |
|
742 | 742 | |
|
743 | 743 | if self.eolmode != b'strict' and eol and eol != b'\n': |
|
744 | 744 | rawlines = [] |
|
745 | 745 | for l in lines: |
|
746 | 746 | if l and l.endswith(b'\n'): |
|
747 | 747 | l = l[:-1] + eol |
|
748 | 748 | rawlines.append(l) |
|
749 | 749 | lines = rawlines |
|
750 | 750 | |
|
751 | 751 | self.backend.setfile(fname, b''.join(lines), mode, self.copysource) |
|
752 | 752 | |
|
753 | 753 | def printfile(self, warn): |
|
754 | 754 | if self.fileprinted: |
|
755 | 755 | return |
|
756 | 756 | if warn or self.ui.verbose: |
|
757 | 757 | self.fileprinted = True |
|
758 | 758 | s = _(b"patching file %s\n") % self.fname |
|
759 | 759 | if warn: |
|
760 | 760 | self.ui.warn(s) |
|
761 | 761 | else: |
|
762 | 762 | self.ui.note(s) |
|
763 | 763 | |
|
764 | 764 | def findlines(self, l, linenum): |
|
765 | 765 | # looks through the hash and finds candidate lines. The |
|
766 | 766 | # result is a list of line numbers sorted based on distance |
|
767 | 767 | # from linenum |
|
768 | 768 | |
|
769 | 769 | cand = self.hash.get(l, []) |
|
770 | 770 | if len(cand) > 1: |
|
771 | 771 | # resort our list of potentials forward then back. |
|
772 | 772 | cand.sort(key=lambda x: abs(x - linenum)) |
|
773 | 773 | return cand |
|
774 | 774 | |
|
775 | 775 | def write_rej(self): |
|
776 | 776 | # our rejects are a little different from patch(1). This always |
|
777 | 777 | # creates rejects in the same form as the original patch. A file |
|
778 | 778 | # header is inserted so that you can run the reject through patch again |
|
779 | 779 | # without having to type the filename. |
|
780 | 780 | if not self.rej: |
|
781 | 781 | return |
|
782 | 782 | base = os.path.basename(self.fname) |
|
783 | 783 | lines = [b"--- %s\n+++ %s\n" % (base, base)] |
|
784 | 784 | for x in self.rej: |
|
785 | 785 | for l in x.hunk: |
|
786 | 786 | lines.append(l) |
|
787 | 787 | if l[-1:] != b'\n': |
|
788 | 788 | lines.append(b'\n' + diffhelper.MISSING_NEWLINE_MARKER) |
|
789 | 789 | self.backend.writerej(self.fname, len(self.rej), self.hunks, lines) |
|
790 | 790 | |
|
791 | 791 | def apply(self, h): |
|
792 | 792 | if not h.complete(): |
|
793 | 793 | raise PatchError( |
|
794 | 794 | _(b"bad hunk #%d %s (%d %d %d %d)") |
|
795 | 795 | % (h.number, h.desc, len(h.a), h.lena, len(h.b), h.lenb) |
|
796 | 796 | ) |
|
797 | 797 | |
|
798 | 798 | self.hunks += 1 |
|
799 | 799 | |
|
800 | 800 | if self.missing: |
|
801 | 801 | self.rej.append(h) |
|
802 | 802 | return -1 |
|
803 | 803 | |
|
804 | 804 | if self.exists and self.create: |
|
805 | 805 | if self.copysource: |
|
806 | 806 | self.ui.warn( |
|
807 | 807 | _(b"cannot create %s: destination already exists\n") |
|
808 | 808 | % self.fname |
|
809 | 809 | ) |
|
810 | 810 | else: |
|
811 | 811 | self.ui.warn(_(b"file %s already exists\n") % self.fname) |
|
812 | 812 | self.rej.append(h) |
|
813 | 813 | return -1 |
|
814 | 814 | |
|
815 | 815 | if isinstance(h, binhunk): |
|
816 | 816 | if self.remove: |
|
817 | 817 | self.backend.unlink(self.fname) |
|
818 | 818 | else: |
|
819 | 819 | l = h.new(self.lines) |
|
820 | 820 | self.lines[:] = l |
|
821 | 821 | self.offset += len(l) |
|
822 | 822 | self.dirty = True |
|
823 | 823 | return 0 |
|
824 | 824 | |
|
825 | 825 | horig = h |
|
826 | 826 | if ( |
|
827 | 827 | self.eolmode in (b'crlf', b'lf') |
|
828 | 828 | or self.eolmode == b'auto' |
|
829 | 829 | and self.eol |
|
830 | 830 | ): |
|
831 | 831 | # If new eols are going to be normalized, then normalize |
|
832 | 832 | # hunk data before patching. Otherwise, preserve input |
|
833 | 833 | # line-endings. |
|
834 | 834 | h = h.getnormalized() |
|
835 | 835 | |
|
836 | 836 | # fast case first, no offsets, no fuzz |
|
837 | 837 | old, oldstart, new, newstart = h.fuzzit(0, False) |
|
838 | 838 | oldstart += self.offset |
|
839 | 839 | orig_start = oldstart |
|
840 | 840 | # if there's skew we want to emit the "(offset %d lines)" even |
|
841 | 841 | # when the hunk cleanly applies at start + skew, so skip the |
|
842 | 842 | # fast case code |
|
843 | 843 | if self.skew == 0 and diffhelper.testhunk(old, self.lines, oldstart): |
|
844 | 844 | if self.remove: |
|
845 | 845 | self.backend.unlink(self.fname) |
|
846 | 846 | else: |
|
847 | 847 | self.lines[oldstart : oldstart + len(old)] = new |
|
848 | 848 | self.offset += len(new) - len(old) |
|
849 | 849 | self.dirty = True |
|
850 | 850 | return 0 |
|
851 | 851 | |
|
852 | 852 | # ok, we couldn't match the hunk. Lets look for offsets and fuzz it |
|
853 | 853 | self.hash = {} |
|
854 | 854 | for x, s in enumerate(self.lines): |
|
855 | 855 | self.hash.setdefault(s, []).append(x) |
|
856 | 856 | |
|
857 | 857 | for fuzzlen in pycompat.xrange( |
|
858 | 858 | self.ui.configint(b"patch", b"fuzz") + 1 |
|
859 | 859 | ): |
|
860 | 860 | for toponly in [True, False]: |
|
861 | 861 | old, oldstart, new, newstart = h.fuzzit(fuzzlen, toponly) |
|
862 | 862 | oldstart = oldstart + self.offset + self.skew |
|
863 | 863 | oldstart = min(oldstart, len(self.lines)) |
|
864 | 864 | if old: |
|
865 | 865 | cand = self.findlines(old[0][1:], oldstart) |
|
866 | 866 | else: |
|
867 | 867 | # Only adding lines with no or fuzzed context, just |
|
868 | 868 | # take the skew in account |
|
869 | 869 | cand = [oldstart] |
|
870 | 870 | |
|
871 | 871 | for l in cand: |
|
872 | 872 | if not old or diffhelper.testhunk(old, self.lines, l): |
|
873 | 873 | self.lines[l : l + len(old)] = new |
|
874 | 874 | self.offset += len(new) - len(old) |
|
875 | 875 | self.skew = l - orig_start |
|
876 | 876 | self.dirty = True |
|
877 | 877 | offset = l - orig_start - fuzzlen |
|
878 | 878 | if fuzzlen: |
|
879 | 879 | msg = _( |
|
880 | 880 | b"Hunk #%d succeeded at %d " |
|
881 | 881 | b"with fuzz %d " |
|
882 | 882 | b"(offset %d lines).\n" |
|
883 | 883 | ) |
|
884 | 884 | self.printfile(True) |
|
885 | 885 | self.ui.warn( |
|
886 | 886 | msg % (h.number, l + 1, fuzzlen, offset) |
|
887 | 887 | ) |
|
888 | 888 | else: |
|
889 | 889 | msg = _( |
|
890 | 890 | b"Hunk #%d succeeded at %d " |
|
891 | 891 | b"(offset %d lines).\n" |
|
892 | 892 | ) |
|
893 | 893 | self.ui.note(msg % (h.number, l + 1, offset)) |
|
894 | 894 | return fuzzlen |
|
895 | 895 | self.printfile(True) |
|
896 | 896 | self.ui.warn(_(b"Hunk #%d FAILED at %d\n") % (h.number, orig_start)) |
|
897 | 897 | self.rej.append(horig) |
|
898 | 898 | return -1 |
|
899 | 899 | |
|
900 | 900 | def close(self): |
|
901 | 901 | if self.dirty: |
|
902 | 902 | self.writelines(self.fname, self.lines, self.mode) |
|
903 | 903 | self.write_rej() |
|
904 | 904 | return len(self.rej) |
|
905 | 905 | |
|
906 | 906 | |
|
907 | 907 | class header(object): |
|
908 | 908 | """patch header""" |
|
909 | 909 | |
|
910 | 910 | diffgit_re = re.compile(b'diff --git a/(.*) b/(.*)$') |
|
911 | 911 | diff_re = re.compile(b'diff -r .* (.*)$') |
|
912 | 912 | allhunks_re = re.compile(b'(?:index|deleted file) ') |
|
913 | 913 | pretty_re = re.compile(b'(?:new file|deleted file) ') |
|
914 | 914 | special_re = re.compile(b'(?:index|deleted|copy|rename|new mode) ') |
|
915 | 915 | newfile_re = re.compile(b'(?:new file|copy to|rename to)') |
|
916 | 916 | |
|
917 | 917 | def __init__(self, header): |
|
918 | 918 | self.header = header |
|
919 | 919 | self.hunks = [] |
|
920 | 920 | |
|
921 | 921 | def binary(self): |
|
922 | 922 | return any(h.startswith(b'index ') for h in self.header) |
|
923 | 923 | |
|
924 | 924 | def pretty(self, fp): |
|
925 | 925 | for h in self.header: |
|
926 | 926 | if h.startswith(b'index '): |
|
927 | 927 | fp.write(_(b'this modifies a binary file (all or nothing)\n')) |
|
928 | 928 | break |
|
929 | 929 | if self.pretty_re.match(h): |
|
930 | 930 | fp.write(h) |
|
931 | 931 | if self.binary(): |
|
932 | 932 | fp.write(_(b'this is a binary file\n')) |
|
933 | 933 | break |
|
934 | 934 | if h.startswith(b'---'): |
|
935 | 935 | fp.write( |
|
936 | 936 | _(b'%d hunks, %d lines changed\n') |
|
937 | 937 | % ( |
|
938 | 938 | len(self.hunks), |
|
939 | 939 | sum([max(h.added, h.removed) for h in self.hunks]), |
|
940 | 940 | ) |
|
941 | 941 | ) |
|
942 | 942 | break |
|
943 | 943 | fp.write(h) |
|
944 | 944 | |
|
945 | 945 | def write(self, fp): |
|
946 | 946 | fp.write(b''.join(self.header)) |
|
947 | 947 | |
|
948 | 948 | def allhunks(self): |
|
949 | 949 | return any(self.allhunks_re.match(h) for h in self.header) |
|
950 | 950 | |
|
951 | 951 | def files(self): |
|
952 | 952 | match = self.diffgit_re.match(self.header[0]) |
|
953 | 953 | if match: |
|
954 | 954 | fromfile, tofile = match.groups() |
|
955 | 955 | if fromfile == tofile: |
|
956 | 956 | return [fromfile] |
|
957 | 957 | return [fromfile, tofile] |
|
958 | 958 | else: |
|
959 | 959 | return self.diff_re.match(self.header[0]).groups() |
|
960 | 960 | |
|
961 | 961 | def filename(self): |
|
962 | 962 | return self.files()[-1] |
|
963 | 963 | |
|
964 | 964 | def __repr__(self): |
|
965 | 965 | return '<header %s>' % ( |
|
966 | 966 | ' '.join(pycompat.rapply(pycompat.fsdecode, self.files())) |
|
967 | 967 | ) |
|
968 | 968 | |
|
969 | 969 | def isnewfile(self): |
|
970 | 970 | return any(self.newfile_re.match(h) for h in self.header) |
|
971 | 971 | |
|
972 | 972 | def special(self): |
|
973 | 973 | # Special files are shown only at the header level and not at the hunk |
|
974 | 974 | # level for example a file that has been deleted is a special file. |
|
975 | 975 | # The user cannot change the content of the operation, in the case of |
|
976 | 976 | # the deleted file he has to take the deletion or not take it, he |
|
977 | 977 | # cannot take some of it. |
|
978 | 978 | # Newly added files are special if they are empty, they are not special |
|
979 | 979 | # if they have some content as we want to be able to change it |
|
980 | 980 | nocontent = len(self.header) == 2 |
|
981 | 981 | emptynewfile = self.isnewfile() and nocontent |
|
982 | 982 | return emptynewfile or any( |
|
983 | 983 | self.special_re.match(h) for h in self.header |
|
984 | 984 | ) |
|
985 | 985 | |
|
986 | 986 | |
|
987 | 987 | class recordhunk(object): |
|
988 | 988 | """patch hunk |
|
989 | 989 | |
|
990 | 990 | XXX shouldn't we merge this with the other hunk class? |
|
991 | 991 | """ |
|
992 | 992 | |
|
993 | 993 | def __init__( |
|
994 | 994 | self, |
|
995 | 995 | header, |
|
996 | 996 | fromline, |
|
997 | 997 | toline, |
|
998 | 998 | proc, |
|
999 | 999 | before, |
|
1000 | 1000 | hunk, |
|
1001 | 1001 | after, |
|
1002 | 1002 | maxcontext=None, |
|
1003 | 1003 | ): |
|
1004 | 1004 | def trimcontext(lines, reverse=False): |
|
1005 | 1005 | if maxcontext is not None: |
|
1006 | 1006 | delta = len(lines) - maxcontext |
|
1007 | 1007 | if delta > 0: |
|
1008 | 1008 | if reverse: |
|
1009 | 1009 | return delta, lines[delta:] |
|
1010 | 1010 | else: |
|
1011 | 1011 | return delta, lines[:maxcontext] |
|
1012 | 1012 | return 0, lines |
|
1013 | 1013 | |
|
1014 | 1014 | self.header = header |
|
1015 | 1015 | trimedbefore, self.before = trimcontext(before, True) |
|
1016 | 1016 | self.fromline = fromline + trimedbefore |
|
1017 | 1017 | self.toline = toline + trimedbefore |
|
1018 | 1018 | _trimedafter, self.after = trimcontext(after, False) |
|
1019 | 1019 | self.proc = proc |
|
1020 | 1020 | self.hunk = hunk |
|
1021 | 1021 | self.added, self.removed = self.countchanges(self.hunk) |
|
1022 | 1022 | |
|
1023 | 1023 | def __eq__(self, v): |
|
1024 | 1024 | if not isinstance(v, recordhunk): |
|
1025 | 1025 | return False |
|
1026 | 1026 | |
|
1027 | 1027 | return ( |
|
1028 | 1028 | (v.hunk == self.hunk) |
|
1029 | 1029 | and (v.proc == self.proc) |
|
1030 | 1030 | and (self.fromline == v.fromline) |
|
1031 | 1031 | and (self.header.files() == v.header.files()) |
|
1032 | 1032 | ) |
|
1033 | 1033 | |
|
1034 | 1034 | def __hash__(self): |
|
1035 | 1035 | return hash( |
|
1036 | 1036 | ( |
|
1037 | 1037 | tuple(self.hunk), |
|
1038 | 1038 | tuple(self.header.files()), |
|
1039 | 1039 | self.fromline, |
|
1040 | 1040 | self.proc, |
|
1041 | 1041 | ) |
|
1042 | 1042 | ) |
|
1043 | 1043 | |
|
1044 | 1044 | def countchanges(self, hunk): |
|
1045 | 1045 | """hunk -> (n+,n-)""" |
|
1046 | 1046 | add = len([h for h in hunk if h.startswith(b'+')]) |
|
1047 | 1047 | rem = len([h for h in hunk if h.startswith(b'-')]) |
|
1048 | 1048 | return add, rem |
|
1049 | 1049 | |
|
1050 | 1050 | def reversehunk(self): |
|
1051 | 1051 | """return another recordhunk which is the reverse of the hunk |
|
1052 | 1052 | |
|
1053 | 1053 | If this hunk is diff(A, B), the returned hunk is diff(B, A). To do |
|
1054 | 1054 | that, swap fromline/toline and +/- signs while keep other things |
|
1055 | 1055 | unchanged. |
|
1056 | 1056 | """ |
|
1057 | 1057 | m = {b'+': b'-', b'-': b'+', b'\\': b'\\'} |
|
1058 | 1058 | hunk = [b'%s%s' % (m[l[0:1]], l[1:]) for l in self.hunk] |
|
1059 | 1059 | return recordhunk( |
|
1060 | 1060 | self.header, |
|
1061 | 1061 | self.toline, |
|
1062 | 1062 | self.fromline, |
|
1063 | 1063 | self.proc, |
|
1064 | 1064 | self.before, |
|
1065 | 1065 | hunk, |
|
1066 | 1066 | self.after, |
|
1067 | 1067 | ) |
|
1068 | 1068 | |
|
1069 | 1069 | def write(self, fp): |
|
1070 | 1070 | delta = len(self.before) + len(self.after) |
|
1071 | 1071 | if self.after and self.after[-1] == diffhelper.MISSING_NEWLINE_MARKER: |
|
1072 | 1072 | delta -= 1 |
|
1073 | 1073 | fromlen = delta + self.removed |
|
1074 | 1074 | tolen = delta + self.added |
|
1075 | 1075 | fp.write( |
|
1076 | 1076 | b'@@ -%d,%d +%d,%d @@%s\n' |
|
1077 | 1077 | % ( |
|
1078 | 1078 | self.fromline, |
|
1079 | 1079 | fromlen, |
|
1080 | 1080 | self.toline, |
|
1081 | 1081 | tolen, |
|
1082 | 1082 | self.proc and (b' ' + self.proc), |
|
1083 | 1083 | ) |
|
1084 | 1084 | ) |
|
1085 | 1085 | fp.write(b''.join(self.before + self.hunk + self.after)) |
|
1086 | 1086 | |
|
1087 | 1087 | pretty = write |
|
1088 | 1088 | |
|
1089 | 1089 | def filename(self): |
|
1090 | 1090 | return self.header.filename() |
|
1091 | 1091 | |
|
1092 | 1092 | @encoding.strmethod |
|
1093 | 1093 | def __repr__(self): |
|
1094 | 1094 | return b'<hunk %r@%d>' % (self.filename(), self.fromline) |
|
1095 | 1095 | |
|
1096 | 1096 | |
|
1097 | 1097 | def getmessages(): |
|
1098 | 1098 | return { |
|
1099 | 1099 | b'multiple': { |
|
1100 | 1100 | b'apply': _(b"apply change %d/%d to '%s'?"), |
|
1101 | 1101 | b'discard': _(b"discard change %d/%d to '%s'?"), |
|
1102 | 1102 | b'keep': _(b"keep change %d/%d to '%s'?"), |
|
1103 | 1103 | b'record': _(b"record change %d/%d to '%s'?"), |
|
1104 | 1104 | }, |
|
1105 | 1105 | b'single': { |
|
1106 | 1106 | b'apply': _(b"apply this change to '%s'?"), |
|
1107 | 1107 | b'discard': _(b"discard this change to '%s'?"), |
|
1108 | 1108 | b'keep': _(b"keep this change to '%s'?"), |
|
1109 | 1109 | b'record': _(b"record this change to '%s'?"), |
|
1110 | 1110 | }, |
|
1111 | 1111 | b'help': { |
|
1112 | 1112 | b'apply': _( |
|
1113 | 1113 | b'[Ynesfdaq?]' |
|
1114 | 1114 | b'$$ &Yes, apply this change' |
|
1115 | 1115 | b'$$ &No, skip this change' |
|
1116 | 1116 | b'$$ &Edit this change manually' |
|
1117 | 1117 | b'$$ &Skip remaining changes to this file' |
|
1118 | 1118 | b'$$ Apply remaining changes to this &file' |
|
1119 | 1119 | b'$$ &Done, skip remaining changes and files' |
|
1120 | 1120 | b'$$ Apply &all changes to all remaining files' |
|
1121 | 1121 | b'$$ &Quit, applying no changes' |
|
1122 | 1122 | b'$$ &? (display help)' |
|
1123 | 1123 | ), |
|
1124 | 1124 | b'discard': _( |
|
1125 | 1125 | b'[Ynesfdaq?]' |
|
1126 | 1126 | b'$$ &Yes, discard this change' |
|
1127 | 1127 | b'$$ &No, skip this change' |
|
1128 | 1128 | b'$$ &Edit this change manually' |
|
1129 | 1129 | b'$$ &Skip remaining changes to this file' |
|
1130 | 1130 | b'$$ Discard remaining changes to this &file' |
|
1131 | 1131 | b'$$ &Done, skip remaining changes and files' |
|
1132 | 1132 | b'$$ Discard &all changes to all remaining files' |
|
1133 | 1133 | b'$$ &Quit, discarding no changes' |
|
1134 | 1134 | b'$$ &? (display help)' |
|
1135 | 1135 | ), |
|
1136 | 1136 | b'keep': _( |
|
1137 | 1137 | b'[Ynesfdaq?]' |
|
1138 | 1138 | b'$$ &Yes, keep this change' |
|
1139 | 1139 | b'$$ &No, skip this change' |
|
1140 | 1140 | b'$$ &Edit this change manually' |
|
1141 | 1141 | b'$$ &Skip remaining changes to this file' |
|
1142 | 1142 | b'$$ Keep remaining changes to this &file' |
|
1143 | 1143 | b'$$ &Done, skip remaining changes and files' |
|
1144 | 1144 | b'$$ Keep &all changes to all remaining files' |
|
1145 | 1145 | b'$$ &Quit, keeping all changes' |
|
1146 | 1146 | b'$$ &? (display help)' |
|
1147 | 1147 | ), |
|
1148 | 1148 | b'record': _( |
|
1149 | 1149 | b'[Ynesfdaq?]' |
|
1150 | 1150 | b'$$ &Yes, record this change' |
|
1151 | 1151 | b'$$ &No, skip this change' |
|
1152 | 1152 | b'$$ &Edit this change manually' |
|
1153 | 1153 | b'$$ &Skip remaining changes to this file' |
|
1154 | 1154 | b'$$ Record remaining changes to this &file' |
|
1155 | 1155 | b'$$ &Done, skip remaining changes and files' |
|
1156 | 1156 | b'$$ Record &all changes to all remaining files' |
|
1157 | 1157 | b'$$ &Quit, recording no changes' |
|
1158 | 1158 | b'$$ &? (display help)' |
|
1159 | 1159 | ), |
|
1160 | 1160 | }, |
|
1161 | 1161 | } |
|
1162 | 1162 | |
|
1163 | 1163 | |
|
1164 | 1164 | def filterpatch(ui, headers, match, operation=None): |
|
1165 | 1165 | """Interactively filter patch chunks into applied-only chunks""" |
|
1166 | 1166 | messages = getmessages() |
|
1167 | 1167 | |
|
1168 | 1168 | if operation is None: |
|
1169 | 1169 | operation = b'record' |
|
1170 | 1170 | |
|
1171 | 1171 | def prompt(skipfile, skipall, query, chunk): |
|
1172 | 1172 | """prompt query, and process base inputs |
|
1173 | 1173 | |
|
1174 | 1174 | - y/n for the rest of file |
|
1175 | 1175 | - y/n for the rest |
|
1176 | 1176 | - ? (help) |
|
1177 | 1177 | - q (quit) |
|
1178 | 1178 | |
|
1179 | 1179 | Return True/False and possibly updated skipfile and skipall. |
|
1180 | 1180 | """ |
|
1181 | 1181 | newpatches = None |
|
1182 | 1182 | if skipall is not None: |
|
1183 | 1183 | return skipall, skipfile, skipall, newpatches |
|
1184 | 1184 | if skipfile is not None: |
|
1185 | 1185 | return skipfile, skipfile, skipall, newpatches |
|
1186 | 1186 | while True: |
|
1187 | 1187 | resps = messages[b'help'][operation] |
|
1188 | 1188 | # IMPORTANT: keep the last line of this prompt short (<40 english |
|
1189 | 1189 | # chars is a good target) because of issue6158. |
|
1190 | 1190 | r = ui.promptchoice(b"%s\n(enter ? for help) %s" % (query, resps)) |
|
1191 | 1191 | ui.write(b"\n") |
|
1192 | 1192 | if r == 8: # ? |
|
1193 | 1193 | for c, t in ui.extractchoices(resps)[1]: |
|
1194 | 1194 | ui.write(b'%s - %s\n' % (c, encoding.lower(t))) |
|
1195 | 1195 | continue |
|
1196 | 1196 | elif r == 0: # yes |
|
1197 | 1197 | ret = True |
|
1198 | 1198 | elif r == 1: # no |
|
1199 | 1199 | ret = False |
|
1200 | 1200 | elif r == 2: # Edit patch |
|
1201 | 1201 | if chunk is None: |
|
1202 | 1202 | ui.write(_(b'cannot edit patch for whole file')) |
|
1203 | 1203 | ui.write(b"\n") |
|
1204 | 1204 | continue |
|
1205 | 1205 | if chunk.header.binary(): |
|
1206 | 1206 | ui.write(_(b'cannot edit patch for binary file')) |
|
1207 | 1207 | ui.write(b"\n") |
|
1208 | 1208 | continue |
|
1209 | 1209 | # Patch comment based on the Git one (based on comment at end of |
|
1210 | 1210 | # https://mercurial-scm.org/wiki/RecordExtension) |
|
1211 | 1211 | phelp = b'---' + _( |
|
1212 | 1212 | """ |
|
1213 | 1213 | To remove '-' lines, make them ' ' lines (context). |
|
1214 | 1214 | To remove '+' lines, delete them. |
|
1215 | 1215 | Lines starting with # will be removed from the patch. |
|
1216 | 1216 | |
|
1217 | 1217 | If the patch applies cleanly, the edited hunk will immediately be |
|
1218 | 1218 | added to the record list. If it does not apply cleanly, a rejects |
|
1219 | 1219 | file will be generated: you can use that when you try again. If |
|
1220 | 1220 | all lines of the hunk are removed, then the edit is aborted and |
|
1221 | 1221 | the hunk is left unchanged. |
|
1222 | 1222 | """ |
|
1223 | 1223 | ) |
|
1224 | 1224 | (patchfd, patchfn) = pycompat.mkstemp( |
|
1225 | 1225 | prefix=b"hg-editor-", suffix=b".diff" |
|
1226 | 1226 | ) |
|
1227 | 1227 | ncpatchfp = None |
|
1228 | 1228 | try: |
|
1229 | 1229 | # Write the initial patch |
|
1230 | 1230 | f = util.nativeeolwriter(os.fdopen(patchfd, 'wb')) |
|
1231 | 1231 | chunk.header.write(f) |
|
1232 | 1232 | chunk.write(f) |
|
1233 | 1233 | f.write( |
|
1234 | 1234 | b''.join( |
|
1235 | 1235 | [b'# ' + i + b'\n' for i in phelp.splitlines()] |
|
1236 | 1236 | ) |
|
1237 | 1237 | ) |
|
1238 | 1238 | f.close() |
|
1239 | 1239 | # Start the editor and wait for it to complete |
|
1240 | 1240 | editor = ui.geteditor() |
|
1241 | 1241 | ret = ui.system( |
|
1242 | 1242 | b"%s \"%s\"" % (editor, patchfn), |
|
1243 | 1243 | environ={b'HGUSER': ui.username()}, |
|
1244 | 1244 | blockedtag=b'filterpatch', |
|
1245 | 1245 | ) |
|
1246 | 1246 | if ret != 0: |
|
1247 | 1247 | ui.warn(_(b"editor exited with exit code %d\n") % ret) |
|
1248 | 1248 | continue |
|
1249 | 1249 | # Remove comment lines |
|
1250 | 1250 | patchfp = open(patchfn, 'rb') |
|
1251 | 1251 | ncpatchfp = stringio() |
|
1252 | 1252 | for line in util.iterfile(patchfp): |
|
1253 | 1253 | line = util.fromnativeeol(line) |
|
1254 | 1254 | if not line.startswith(b'#'): |
|
1255 | 1255 | ncpatchfp.write(line) |
|
1256 | 1256 | patchfp.close() |
|
1257 | 1257 | ncpatchfp.seek(0) |
|
1258 | 1258 | newpatches = parsepatch(ncpatchfp) |
|
1259 | 1259 | finally: |
|
1260 | 1260 | os.unlink(patchfn) |
|
1261 | 1261 | del ncpatchfp |
|
1262 | 1262 | # Signal that the chunk shouldn't be applied as-is, but |
|
1263 | 1263 | # provide the new patch to be used instead. |
|
1264 | 1264 | ret = False |
|
1265 | 1265 | elif r == 3: # Skip |
|
1266 | 1266 | ret = skipfile = False |
|
1267 | 1267 | elif r == 4: # file (Record remaining) |
|
1268 | 1268 | ret = skipfile = True |
|
1269 | 1269 | elif r == 5: # done, skip remaining |
|
1270 | 1270 | ret = skipall = False |
|
1271 | 1271 | elif r == 6: # all |
|
1272 | 1272 | ret = skipall = True |
|
1273 | 1273 | elif r == 7: # quit |
|
1274 | 1274 | raise error.CanceledError(_(b'user quit')) |
|
1275 | 1275 | return ret, skipfile, skipall, newpatches |
|
1276 | 1276 | |
|
1277 | 1277 | seen = set() |
|
1278 | 1278 | applied = {} # 'filename' -> [] of chunks |
|
1279 | 1279 | skipfile, skipall = None, None |
|
1280 | 1280 | pos, total = 1, sum(len(h.hunks) for h in headers) |
|
1281 | 1281 | for h in headers: |
|
1282 | 1282 | pos += len(h.hunks) |
|
1283 | 1283 | skipfile = None |
|
1284 | 1284 | fixoffset = 0 |
|
1285 | 1285 | hdr = b''.join(h.header) |
|
1286 | 1286 | if hdr in seen: |
|
1287 | 1287 | continue |
|
1288 | 1288 | seen.add(hdr) |
|
1289 | 1289 | if skipall is None: |
|
1290 | 1290 | h.pretty(ui) |
|
1291 | 1291 | files = h.files() |
|
1292 | 1292 | msg = _(b'examine changes to %s?') % _(b' and ').join( |
|
1293 | 1293 | b"'%s'" % f for f in files |
|
1294 | 1294 | ) |
|
1295 | 1295 | if all(match.exact(f) for f in files): |
|
1296 | 1296 | r, skipall, np = True, None, None |
|
1297 | 1297 | else: |
|
1298 | 1298 | r, skipfile, skipall, np = prompt(skipfile, skipall, msg, None) |
|
1299 | 1299 | if not r: |
|
1300 | 1300 | continue |
|
1301 | 1301 | applied[h.filename()] = [h] |
|
1302 | 1302 | if h.allhunks(): |
|
1303 | 1303 | applied[h.filename()] += h.hunks |
|
1304 | 1304 | continue |
|
1305 | 1305 | for i, chunk in enumerate(h.hunks): |
|
1306 | 1306 | if skipfile is None and skipall is None: |
|
1307 | 1307 | chunk.pretty(ui) |
|
1308 | 1308 | if total == 1: |
|
1309 | 1309 | msg = messages[b'single'][operation] % chunk.filename() |
|
1310 | 1310 | else: |
|
1311 | 1311 | idx = pos - len(h.hunks) + i |
|
1312 | 1312 | msg = messages[b'multiple'][operation] % ( |
|
1313 | 1313 | idx, |
|
1314 | 1314 | total, |
|
1315 | 1315 | chunk.filename(), |
|
1316 | 1316 | ) |
|
1317 | 1317 | r, skipfile, skipall, newpatches = prompt( |
|
1318 | 1318 | skipfile, skipall, msg, chunk |
|
1319 | 1319 | ) |
|
1320 | 1320 | if r: |
|
1321 | 1321 | if fixoffset: |
|
1322 | 1322 | chunk = copy.copy(chunk) |
|
1323 | 1323 | chunk.toline += fixoffset |
|
1324 | 1324 | applied[chunk.filename()].append(chunk) |
|
1325 | 1325 | elif newpatches is not None: |
|
1326 | 1326 | for newpatch in newpatches: |
|
1327 | 1327 | for newhunk in newpatch.hunks: |
|
1328 | 1328 | if fixoffset: |
|
1329 | 1329 | newhunk.toline += fixoffset |
|
1330 | 1330 | applied[newhunk.filename()].append(newhunk) |
|
1331 | 1331 | else: |
|
1332 | 1332 | fixoffset += chunk.removed - chunk.added |
|
1333 | 1333 | return ( |
|
1334 | 1334 | sum( |
|
1335 | 1335 | [ |
|
1336 | 1336 | h |
|
1337 | 1337 | for h in pycompat.itervalues(applied) |
|
1338 | 1338 | if h[0].special() or len(h) > 1 |
|
1339 | 1339 | ], |
|
1340 | 1340 | [], |
|
1341 | 1341 | ), |
|
1342 | 1342 | {}, |
|
1343 | 1343 | ) |
|
1344 | 1344 | |
|
1345 | 1345 | |
|
1346 | 1346 | class hunk(object): |
|
1347 | 1347 | def __init__(self, desc, num, lr, context): |
|
1348 | 1348 | self.number = num |
|
1349 | 1349 | self.desc = desc |
|
1350 | 1350 | self.hunk = [desc] |
|
1351 | 1351 | self.a = [] |
|
1352 | 1352 | self.b = [] |
|
1353 | 1353 | self.starta = self.lena = None |
|
1354 | 1354 | self.startb = self.lenb = None |
|
1355 | 1355 | if lr is not None: |
|
1356 | 1356 | if context: |
|
1357 | 1357 | self.read_context_hunk(lr) |
|
1358 | 1358 | else: |
|
1359 | 1359 | self.read_unified_hunk(lr) |
|
1360 | 1360 | |
|
1361 | 1361 | def getnormalized(self): |
|
1362 | 1362 | """Return a copy with line endings normalized to LF.""" |
|
1363 | 1363 | |
|
1364 | 1364 | def normalize(lines): |
|
1365 | 1365 | nlines = [] |
|
1366 | 1366 | for line in lines: |
|
1367 | 1367 | if line.endswith(b'\r\n'): |
|
1368 | 1368 | line = line[:-2] + b'\n' |
|
1369 | 1369 | nlines.append(line) |
|
1370 | 1370 | return nlines |
|
1371 | 1371 | |
|
1372 | 1372 | # Dummy object, it is rebuilt manually |
|
1373 | 1373 | nh = hunk(self.desc, self.number, None, None) |
|
1374 | 1374 | nh.number = self.number |
|
1375 | 1375 | nh.desc = self.desc |
|
1376 | 1376 | nh.hunk = self.hunk |
|
1377 | 1377 | nh.a = normalize(self.a) |
|
1378 | 1378 | nh.b = normalize(self.b) |
|
1379 | 1379 | nh.starta = self.starta |
|
1380 | 1380 | nh.startb = self.startb |
|
1381 | 1381 | nh.lena = self.lena |
|
1382 | 1382 | nh.lenb = self.lenb |
|
1383 | 1383 | return nh |
|
1384 | 1384 | |
|
1385 | 1385 | def read_unified_hunk(self, lr): |
|
1386 | 1386 | m = unidesc.match(self.desc) |
|
1387 | 1387 | if not m: |
|
1388 | 1388 | raise PatchError(_(b"bad hunk #%d") % self.number) |
|
1389 | 1389 | self.starta, self.lena, self.startb, self.lenb = m.groups() |
|
1390 | 1390 | if self.lena is None: |
|
1391 | 1391 | self.lena = 1 |
|
1392 | 1392 | else: |
|
1393 | 1393 | self.lena = int(self.lena) |
|
1394 | 1394 | if self.lenb is None: |
|
1395 | 1395 | self.lenb = 1 |
|
1396 | 1396 | else: |
|
1397 | 1397 | self.lenb = int(self.lenb) |
|
1398 | 1398 | self.starta = int(self.starta) |
|
1399 | 1399 | self.startb = int(self.startb) |
|
1400 | 1400 | try: |
|
1401 | 1401 | diffhelper.addlines( |
|
1402 | 1402 | lr, self.hunk, self.lena, self.lenb, self.a, self.b |
|
1403 | 1403 | ) |
|
1404 | 1404 | except error.ParseError as e: |
|
1405 | 1405 | raise PatchError(_(b"bad hunk #%d: %s") % (self.number, e)) |
|
1406 | 1406 | # if we hit eof before finishing out the hunk, the last line will |
|
1407 | 1407 | # be zero length. Lets try to fix it up. |
|
1408 | 1408 | while len(self.hunk[-1]) == 0: |
|
1409 | 1409 | del self.hunk[-1] |
|
1410 | 1410 | del self.a[-1] |
|
1411 | 1411 | del self.b[-1] |
|
1412 | 1412 | self.lena -= 1 |
|
1413 | 1413 | self.lenb -= 1 |
|
1414 | 1414 | self._fixnewline(lr) |
|
1415 | 1415 | |
|
1416 | 1416 | def read_context_hunk(self, lr): |
|
1417 | 1417 | self.desc = lr.readline() |
|
1418 | 1418 | m = contextdesc.match(self.desc) |
|
1419 | 1419 | if not m: |
|
1420 | 1420 | raise PatchError(_(b"bad hunk #%d") % self.number) |
|
1421 | 1421 | self.starta, aend = m.groups() |
|
1422 | 1422 | self.starta = int(self.starta) |
|
1423 | 1423 | if aend is None: |
|
1424 | 1424 | aend = self.starta |
|
1425 | 1425 | self.lena = int(aend) - self.starta |
|
1426 | 1426 | if self.starta: |
|
1427 | 1427 | self.lena += 1 |
|
1428 | 1428 | for x in pycompat.xrange(self.lena): |
|
1429 | 1429 | l = lr.readline() |
|
1430 | 1430 | if l.startswith(b'---'): |
|
1431 | 1431 | # lines addition, old block is empty |
|
1432 | 1432 | lr.push(l) |
|
1433 | 1433 | break |
|
1434 | 1434 | s = l[2:] |
|
1435 | 1435 | if l.startswith(b'- ') or l.startswith(b'! '): |
|
1436 | 1436 | u = b'-' + s |
|
1437 | 1437 | elif l.startswith(b' '): |
|
1438 | 1438 | u = b' ' + s |
|
1439 | 1439 | else: |
|
1440 | 1440 | raise PatchError( |
|
1441 | 1441 | _(b"bad hunk #%d old text line %d") % (self.number, x) |
|
1442 | 1442 | ) |
|
1443 | 1443 | self.a.append(u) |
|
1444 | 1444 | self.hunk.append(u) |
|
1445 | 1445 | |
|
1446 | 1446 | l = lr.readline() |
|
1447 | 1447 | if l.startswith(br'\ '): |
|
1448 | 1448 | s = self.a[-1][:-1] |
|
1449 | 1449 | self.a[-1] = s |
|
1450 | 1450 | self.hunk[-1] = s |
|
1451 | 1451 | l = lr.readline() |
|
1452 | 1452 | m = contextdesc.match(l) |
|
1453 | 1453 | if not m: |
|
1454 | 1454 | raise PatchError(_(b"bad hunk #%d") % self.number) |
|
1455 | 1455 | self.startb, bend = m.groups() |
|
1456 | 1456 | self.startb = int(self.startb) |
|
1457 | 1457 | if bend is None: |
|
1458 | 1458 | bend = self.startb |
|
1459 | 1459 | self.lenb = int(bend) - self.startb |
|
1460 | 1460 | if self.startb: |
|
1461 | 1461 | self.lenb += 1 |
|
1462 | 1462 | hunki = 1 |
|
1463 | 1463 | for x in pycompat.xrange(self.lenb): |
|
1464 | 1464 | l = lr.readline() |
|
1465 | 1465 | if l.startswith(br'\ '): |
|
1466 | 1466 | # XXX: the only way to hit this is with an invalid line range. |
|
1467 | 1467 | # The no-eol marker is not counted in the line range, but I |
|
1468 | 1468 | # guess there are diff(1) out there which behave differently. |
|
1469 | 1469 | s = self.b[-1][:-1] |
|
1470 | 1470 | self.b[-1] = s |
|
1471 | 1471 | self.hunk[hunki - 1] = s |
|
1472 | 1472 | continue |
|
1473 | 1473 | if not l: |
|
1474 | 1474 | # line deletions, new block is empty and we hit EOF |
|
1475 | 1475 | lr.push(l) |
|
1476 | 1476 | break |
|
1477 | 1477 | s = l[2:] |
|
1478 | 1478 | if l.startswith(b'+ ') or l.startswith(b'! '): |
|
1479 | 1479 | u = b'+' + s |
|
1480 | 1480 | elif l.startswith(b' '): |
|
1481 | 1481 | u = b' ' + s |
|
1482 | 1482 | elif len(self.b) == 0: |
|
1483 | 1483 | # line deletions, new block is empty |
|
1484 | 1484 | lr.push(l) |
|
1485 | 1485 | break |
|
1486 | 1486 | else: |
|
1487 | 1487 | raise PatchError( |
|
1488 | 1488 | _(b"bad hunk #%d old text line %d") % (self.number, x) |
|
1489 | 1489 | ) |
|
1490 | 1490 | self.b.append(s) |
|
1491 | 1491 | while True: |
|
1492 | 1492 | if hunki >= len(self.hunk): |
|
1493 | 1493 | h = b"" |
|
1494 | 1494 | else: |
|
1495 | 1495 | h = self.hunk[hunki] |
|
1496 | 1496 | hunki += 1 |
|
1497 | 1497 | if h == u: |
|
1498 | 1498 | break |
|
1499 | 1499 | elif h.startswith(b'-'): |
|
1500 | 1500 | continue |
|
1501 | 1501 | else: |
|
1502 | 1502 | self.hunk.insert(hunki - 1, u) |
|
1503 | 1503 | break |
|
1504 | 1504 | |
|
1505 | 1505 | if not self.a: |
|
1506 | 1506 | # this happens when lines were only added to the hunk |
|
1507 | 1507 | for x in self.hunk: |
|
1508 | 1508 | if x.startswith(b'-') or x.startswith(b' '): |
|
1509 | 1509 | self.a.append(x) |
|
1510 | 1510 | if not self.b: |
|
1511 | 1511 | # this happens when lines were only deleted from the hunk |
|
1512 | 1512 | for x in self.hunk: |
|
1513 | 1513 | if x.startswith(b'+') or x.startswith(b' '): |
|
1514 | 1514 | self.b.append(x[1:]) |
|
1515 | 1515 | # @@ -start,len +start,len @@ |
|
1516 | 1516 | self.desc = b"@@ -%d,%d +%d,%d @@\n" % ( |
|
1517 | 1517 | self.starta, |
|
1518 | 1518 | self.lena, |
|
1519 | 1519 | self.startb, |
|
1520 | 1520 | self.lenb, |
|
1521 | 1521 | ) |
|
1522 | 1522 | self.hunk[0] = self.desc |
|
1523 | 1523 | self._fixnewline(lr) |
|
1524 | 1524 | |
|
1525 | 1525 | def _fixnewline(self, lr): |
|
1526 | 1526 | l = lr.readline() |
|
1527 | 1527 | if l.startswith(br'\ '): |
|
1528 | 1528 | diffhelper.fixnewline(self.hunk, self.a, self.b) |
|
1529 | 1529 | else: |
|
1530 | 1530 | lr.push(l) |
|
1531 | 1531 | |
|
1532 | 1532 | def complete(self): |
|
1533 | 1533 | return len(self.a) == self.lena and len(self.b) == self.lenb |
|
1534 | 1534 | |
|
1535 | 1535 | def _fuzzit(self, old, new, fuzz, toponly): |
|
1536 | 1536 | # this removes context lines from the top and bottom of list 'l'. It |
|
1537 | 1537 | # checks the hunk to make sure only context lines are removed, and then |
|
1538 | 1538 | # returns a new shortened list of lines. |
|
1539 | 1539 | fuzz = min(fuzz, len(old)) |
|
1540 | 1540 | if fuzz: |
|
1541 | 1541 | top = 0 |
|
1542 | 1542 | bot = 0 |
|
1543 | 1543 | hlen = len(self.hunk) |
|
1544 | 1544 | for x in pycompat.xrange(hlen - 1): |
|
1545 | 1545 | # the hunk starts with the @@ line, so use x+1 |
|
1546 | 1546 | if self.hunk[x + 1].startswith(b' '): |
|
1547 | 1547 | top += 1 |
|
1548 | 1548 | else: |
|
1549 | 1549 | break |
|
1550 | 1550 | if not toponly: |
|
1551 | 1551 | for x in pycompat.xrange(hlen - 1): |
|
1552 | 1552 | if self.hunk[hlen - bot - 1].startswith(b' '): |
|
1553 | 1553 | bot += 1 |
|
1554 | 1554 | else: |
|
1555 | 1555 | break |
|
1556 | 1556 | |
|
1557 | 1557 | bot = min(fuzz, bot) |
|
1558 | 1558 | top = min(fuzz, top) |
|
1559 | 1559 | return old[top : len(old) - bot], new[top : len(new) - bot], top |
|
1560 | 1560 | return old, new, 0 |
|
1561 | 1561 | |
|
1562 | 1562 | def fuzzit(self, fuzz, toponly): |
|
1563 | 1563 | old, new, top = self._fuzzit(self.a, self.b, fuzz, toponly) |
|
1564 | 1564 | oldstart = self.starta + top |
|
1565 | 1565 | newstart = self.startb + top |
|
1566 | 1566 | # zero length hunk ranges already have their start decremented |
|
1567 | 1567 | if self.lena and oldstart > 0: |
|
1568 | 1568 | oldstart -= 1 |
|
1569 | 1569 | if self.lenb and newstart > 0: |
|
1570 | 1570 | newstart -= 1 |
|
1571 | 1571 | return old, oldstart, new, newstart |
|
1572 | 1572 | |
|
1573 | 1573 | |
|
1574 | 1574 | class binhunk(object): |
|
1575 | 1575 | """A binary patch file.""" |
|
1576 | 1576 | |
|
1577 | 1577 | def __init__(self, lr, fname): |
|
1578 | 1578 | self.text = None |
|
1579 | 1579 | self.delta = False |
|
1580 | 1580 | self.hunk = [b'GIT binary patch\n'] |
|
1581 | 1581 | self._fname = fname |
|
1582 | 1582 | self._read(lr) |
|
1583 | 1583 | |
|
1584 | 1584 | def complete(self): |
|
1585 | 1585 | return self.text is not None |
|
1586 | 1586 | |
|
1587 | 1587 | def new(self, lines): |
|
1588 | 1588 | if self.delta: |
|
1589 | 1589 | return [applybindelta(self.text, b''.join(lines))] |
|
1590 | 1590 | return [self.text] |
|
1591 | 1591 | |
|
1592 | 1592 | def _read(self, lr): |
|
1593 | 1593 | def getline(lr, hunk): |
|
1594 | 1594 | l = lr.readline() |
|
1595 | 1595 | hunk.append(l) |
|
1596 | 1596 | return l.rstrip(b'\r\n') |
|
1597 | 1597 | |
|
1598 | 1598 | while True: |
|
1599 | 1599 | line = getline(lr, self.hunk) |
|
1600 | 1600 | if not line: |
|
1601 | 1601 | raise PatchError( |
|
1602 | 1602 | _(b'could not extract "%s" binary data') % self._fname |
|
1603 | 1603 | ) |
|
1604 | 1604 | if line.startswith(b'literal '): |
|
1605 | 1605 | size = int(line[8:].rstrip()) |
|
1606 | 1606 | break |
|
1607 | 1607 | if line.startswith(b'delta '): |
|
1608 | 1608 | size = int(line[6:].rstrip()) |
|
1609 | 1609 | self.delta = True |
|
1610 | 1610 | break |
|
1611 | 1611 | dec = [] |
|
1612 | 1612 | line = getline(lr, self.hunk) |
|
1613 | 1613 | while len(line) > 1: |
|
1614 | 1614 | l = line[0:1] |
|
1615 | 1615 | if l <= b'Z' and l >= b'A': |
|
1616 | 1616 | l = ord(l) - ord(b'A') + 1 |
|
1617 | 1617 | else: |
|
1618 | 1618 | l = ord(l) - ord(b'a') + 27 |
|
1619 | 1619 | try: |
|
1620 | 1620 | dec.append(util.b85decode(line[1:])[:l]) |
|
1621 | 1621 | except ValueError as e: |
|
1622 | 1622 | raise PatchError( |
|
1623 | 1623 | _(b'could not decode "%s" binary patch: %s') |
|
1624 | 1624 | % (self._fname, stringutil.forcebytestr(e)) |
|
1625 | 1625 | ) |
|
1626 | 1626 | line = getline(lr, self.hunk) |
|
1627 | 1627 | text = zlib.decompress(b''.join(dec)) |
|
1628 | 1628 | if len(text) != size: |
|
1629 | 1629 | raise PatchError( |
|
1630 | 1630 | _(b'"%s" length is %d bytes, should be %d') |
|
1631 | 1631 | % (self._fname, len(text), size) |
|
1632 | 1632 | ) |
|
1633 | 1633 | self.text = text |
|
1634 | 1634 | |
|
1635 | 1635 | |
|
1636 | 1636 | def parsefilename(str): |
|
1637 | 1637 | # --- filename \t|space stuff |
|
1638 | 1638 | s = str[4:].rstrip(b'\r\n') |
|
1639 | 1639 | i = s.find(b'\t') |
|
1640 | 1640 | if i < 0: |
|
1641 | 1641 | i = s.find(b' ') |
|
1642 | 1642 | if i < 0: |
|
1643 | 1643 | return s |
|
1644 | 1644 | return s[:i] |
|
1645 | 1645 | |
|
1646 | 1646 | |
|
1647 | 1647 | def reversehunks(hunks): |
|
1648 | 1648 | '''reverse the signs in the hunks given as argument |
|
1649 | 1649 | |
|
1650 | 1650 | This function operates on hunks coming out of patch.filterpatch, that is |
|
1651 | 1651 | a list of the form: [header1, hunk1, hunk2, header2...]. Example usage: |
|
1652 | 1652 | |
|
1653 | 1653 | >>> rawpatch = b"""diff --git a/folder1/g b/folder1/g |
|
1654 | 1654 | ... --- a/folder1/g |
|
1655 | 1655 | ... +++ b/folder1/g |
|
1656 | 1656 | ... @@ -1,7 +1,7 @@ |
|
1657 | 1657 | ... +firstline |
|
1658 | 1658 | ... c |
|
1659 | 1659 | ... 1 |
|
1660 | 1660 | ... 2 |
|
1661 | 1661 | ... + 3 |
|
1662 | 1662 | ... -4 |
|
1663 | 1663 | ... 5 |
|
1664 | 1664 | ... d |
|
1665 | 1665 | ... +lastline""" |
|
1666 | 1666 | >>> hunks = parsepatch([rawpatch]) |
|
1667 | 1667 | >>> hunkscomingfromfilterpatch = [] |
|
1668 | 1668 | >>> for h in hunks: |
|
1669 | 1669 | ... hunkscomingfromfilterpatch.append(h) |
|
1670 | 1670 | ... hunkscomingfromfilterpatch.extend(h.hunks) |
|
1671 | 1671 | |
|
1672 | 1672 | >>> reversedhunks = reversehunks(hunkscomingfromfilterpatch) |
|
1673 | 1673 | >>> from . import util |
|
1674 | 1674 | >>> fp = util.stringio() |
|
1675 | 1675 | >>> for c in reversedhunks: |
|
1676 | 1676 | ... c.write(fp) |
|
1677 | 1677 | >>> fp.seek(0) or None |
|
1678 | 1678 | >>> reversedpatch = fp.read() |
|
1679 | 1679 | >>> print(pycompat.sysstr(reversedpatch)) |
|
1680 | 1680 | diff --git a/folder1/g b/folder1/g |
|
1681 | 1681 | --- a/folder1/g |
|
1682 | 1682 | +++ b/folder1/g |
|
1683 | 1683 | @@ -1,4 +1,3 @@ |
|
1684 | 1684 | -firstline |
|
1685 | 1685 | c |
|
1686 | 1686 | 1 |
|
1687 | 1687 | 2 |
|
1688 | 1688 | @@ -2,6 +1,6 @@ |
|
1689 | 1689 | c |
|
1690 | 1690 | 1 |
|
1691 | 1691 | 2 |
|
1692 | 1692 | - 3 |
|
1693 | 1693 | +4 |
|
1694 | 1694 | 5 |
|
1695 | 1695 | d |
|
1696 | 1696 | @@ -6,3 +5,2 @@ |
|
1697 | 1697 | 5 |
|
1698 | 1698 | d |
|
1699 | 1699 | -lastline |
|
1700 | 1700 | |
|
1701 | 1701 | ''' |
|
1702 | 1702 | |
|
1703 | 1703 | newhunks = [] |
|
1704 | 1704 | for c in hunks: |
|
1705 | 1705 | if util.safehasattr(c, b'reversehunk'): |
|
1706 | 1706 | c = c.reversehunk() |
|
1707 | 1707 | newhunks.append(c) |
|
1708 | 1708 | return newhunks |
|
1709 | 1709 | |
|
1710 | 1710 | |
|
1711 | 1711 | def parsepatch(originalchunks, maxcontext=None): |
|
1712 | 1712 | """patch -> [] of headers -> [] of hunks |
|
1713 | 1713 | |
|
1714 | 1714 | If maxcontext is not None, trim context lines if necessary. |
|
1715 | 1715 | |
|
1716 | 1716 | >>> rawpatch = b'''diff --git a/folder1/g b/folder1/g |
|
1717 | 1717 | ... --- a/folder1/g |
|
1718 | 1718 | ... +++ b/folder1/g |
|
1719 | 1719 | ... @@ -1,8 +1,10 @@ |
|
1720 | 1720 | ... 1 |
|
1721 | 1721 | ... 2 |
|
1722 | 1722 | ... -3 |
|
1723 | 1723 | ... 4 |
|
1724 | 1724 | ... 5 |
|
1725 | 1725 | ... 6 |
|
1726 | 1726 | ... +6.1 |
|
1727 | 1727 | ... +6.2 |
|
1728 | 1728 | ... 7 |
|
1729 | 1729 | ... 8 |
|
1730 | 1730 | ... +9''' |
|
1731 | 1731 | >>> out = util.stringio() |
|
1732 | 1732 | >>> headers = parsepatch([rawpatch], maxcontext=1) |
|
1733 | 1733 | >>> for header in headers: |
|
1734 | 1734 | ... header.write(out) |
|
1735 | 1735 | ... for hunk in header.hunks: |
|
1736 | 1736 | ... hunk.write(out) |
|
1737 | 1737 | >>> print(pycompat.sysstr(out.getvalue())) |
|
1738 | 1738 | diff --git a/folder1/g b/folder1/g |
|
1739 | 1739 | --- a/folder1/g |
|
1740 | 1740 | +++ b/folder1/g |
|
1741 | 1741 | @@ -2,3 +2,2 @@ |
|
1742 | 1742 | 2 |
|
1743 | 1743 | -3 |
|
1744 | 1744 | 4 |
|
1745 | 1745 | @@ -6,2 +5,4 @@ |
|
1746 | 1746 | 6 |
|
1747 | 1747 | +6.1 |
|
1748 | 1748 | +6.2 |
|
1749 | 1749 | 7 |
|
1750 | 1750 | @@ -8,1 +9,2 @@ |
|
1751 | 1751 | 8 |
|
1752 | 1752 | +9 |
|
1753 | 1753 | """ |
|
1754 | 1754 | |
|
1755 | 1755 | class parser(object): |
|
1756 | 1756 | """patch parsing state machine""" |
|
1757 | 1757 | |
|
1758 | 1758 | def __init__(self): |
|
1759 | 1759 | self.fromline = 0 |
|
1760 | 1760 | self.toline = 0 |
|
1761 | 1761 | self.proc = b'' |
|
1762 | 1762 | self.header = None |
|
1763 | 1763 | self.context = [] |
|
1764 | 1764 | self.before = [] |
|
1765 | 1765 | self.hunk = [] |
|
1766 | 1766 | self.headers = [] |
|
1767 | 1767 | |
|
1768 | 1768 | def addrange(self, limits): |
|
1769 | 1769 | self.addcontext([]) |
|
1770 | 1770 | fromstart, fromend, tostart, toend, proc = limits |
|
1771 | 1771 | self.fromline = int(fromstart) |
|
1772 | 1772 | self.toline = int(tostart) |
|
1773 | 1773 | self.proc = proc |
|
1774 | 1774 | |
|
1775 | 1775 | def addcontext(self, context): |
|
1776 | 1776 | if self.hunk: |
|
1777 | 1777 | h = recordhunk( |
|
1778 | 1778 | self.header, |
|
1779 | 1779 | self.fromline, |
|
1780 | 1780 | self.toline, |
|
1781 | 1781 | self.proc, |
|
1782 | 1782 | self.before, |
|
1783 | 1783 | self.hunk, |
|
1784 | 1784 | context, |
|
1785 | 1785 | maxcontext, |
|
1786 | 1786 | ) |
|
1787 | 1787 | self.header.hunks.append(h) |
|
1788 | 1788 | self.fromline += len(self.before) + h.removed |
|
1789 | 1789 | self.toline += len(self.before) + h.added |
|
1790 | 1790 | self.before = [] |
|
1791 | 1791 | self.hunk = [] |
|
1792 | 1792 | self.context = context |
|
1793 | 1793 | |
|
1794 | 1794 | def addhunk(self, hunk): |
|
1795 | 1795 | if self.context: |
|
1796 | 1796 | self.before = self.context |
|
1797 | 1797 | self.context = [] |
|
1798 | 1798 | if self.hunk: |
|
1799 | 1799 | self.addcontext([]) |
|
1800 | 1800 | self.hunk = hunk |
|
1801 | 1801 | |
|
1802 | 1802 | def newfile(self, hdr): |
|
1803 | 1803 | self.addcontext([]) |
|
1804 | 1804 | h = header(hdr) |
|
1805 | 1805 | self.headers.append(h) |
|
1806 | 1806 | self.header = h |
|
1807 | 1807 | |
|
1808 | 1808 | def addother(self, line): |
|
1809 | 1809 | pass # 'other' lines are ignored |
|
1810 | 1810 | |
|
1811 | 1811 | def finished(self): |
|
1812 | 1812 | self.addcontext([]) |
|
1813 | 1813 | return self.headers |
|
1814 | 1814 | |
|
1815 | 1815 | transitions = { |
|
1816 | 1816 | b'file': { |
|
1817 | 1817 | b'context': addcontext, |
|
1818 | 1818 | b'file': newfile, |
|
1819 | 1819 | b'hunk': addhunk, |
|
1820 | 1820 | b'range': addrange, |
|
1821 | 1821 | }, |
|
1822 | 1822 | b'context': { |
|
1823 | 1823 | b'file': newfile, |
|
1824 | 1824 | b'hunk': addhunk, |
|
1825 | 1825 | b'range': addrange, |
|
1826 | 1826 | b'other': addother, |
|
1827 | 1827 | }, |
|
1828 | 1828 | b'hunk': { |
|
1829 | 1829 | b'context': addcontext, |
|
1830 | 1830 | b'file': newfile, |
|
1831 | 1831 | b'range': addrange, |
|
1832 | 1832 | }, |
|
1833 | 1833 | b'range': {b'context': addcontext, b'hunk': addhunk}, |
|
1834 | 1834 | b'other': {b'other': addother}, |
|
1835 | 1835 | } |
|
1836 | 1836 | |
|
1837 | 1837 | p = parser() |
|
1838 | 1838 | fp = stringio() |
|
1839 | 1839 | fp.write(b''.join(originalchunks)) |
|
1840 | 1840 | fp.seek(0) |
|
1841 | 1841 | |
|
1842 | 1842 | state = b'context' |
|
1843 | 1843 | for newstate, data in scanpatch(fp): |
|
1844 | 1844 | try: |
|
1845 | 1845 | p.transitions[state][newstate](p, data) |
|
1846 | 1846 | except KeyError: |
|
1847 | 1847 | raise PatchError( |
|
1848 | 1848 | b'unhandled transition: %s -> %s' % (state, newstate) |
|
1849 | 1849 | ) |
|
1850 | 1850 | state = newstate |
|
1851 | 1851 | del fp |
|
1852 | 1852 | return p.finished() |
|
1853 | 1853 | |
|
1854 | 1854 | |
|
1855 | 1855 | def pathtransform(path, strip, prefix): |
|
1856 | 1856 | """turn a path from a patch into a path suitable for the repository |
|
1857 | 1857 | |
|
1858 | 1858 | prefix, if not empty, is expected to be normalized with a / at the end. |
|
1859 | 1859 | |
|
1860 | 1860 | Returns (stripped components, path in repository). |
|
1861 | 1861 | |
|
1862 | 1862 | >>> pathtransform(b'a/b/c', 0, b'') |
|
1863 | 1863 | ('', 'a/b/c') |
|
1864 | 1864 | >>> pathtransform(b' a/b/c ', 0, b'') |
|
1865 | 1865 | ('', ' a/b/c') |
|
1866 | 1866 | >>> pathtransform(b' a/b/c ', 2, b'') |
|
1867 | 1867 | ('a/b/', 'c') |
|
1868 | 1868 | >>> pathtransform(b'a/b/c', 0, b'd/e/') |
|
1869 | 1869 | ('', 'd/e/a/b/c') |
|
1870 | 1870 | >>> pathtransform(b' a//b/c ', 2, b'd/e/') |
|
1871 | 1871 | ('a//b/', 'd/e/c') |
|
1872 | 1872 | >>> pathtransform(b'a/b/c', 3, b'') |
|
1873 | 1873 | Traceback (most recent call last): |
|
1874 | 1874 | PatchError: unable to strip away 1 of 3 dirs from a/b/c |
|
1875 | 1875 | """ |
|
1876 | 1876 | pathlen = len(path) |
|
1877 | 1877 | i = 0 |
|
1878 | 1878 | if strip == 0: |
|
1879 | 1879 | return b'', prefix + path.rstrip() |
|
1880 | 1880 | count = strip |
|
1881 | 1881 | while count > 0: |
|
1882 | 1882 | i = path.find(b'/', i) |
|
1883 | 1883 | if i == -1: |
|
1884 | 1884 | raise PatchError( |
|
1885 | 1885 | _(b"unable to strip away %d of %d dirs from %s") |
|
1886 | 1886 | % (count, strip, path) |
|
1887 | 1887 | ) |
|
1888 | 1888 | i += 1 |
|
1889 | 1889 | # consume '//' in the path |
|
1890 | 1890 | while i < pathlen - 1 and path[i : i + 1] == b'/': |
|
1891 | 1891 | i += 1 |
|
1892 | 1892 | count -= 1 |
|
1893 | 1893 | return path[:i].lstrip(), prefix + path[i:].rstrip() |
|
1894 | 1894 | |
|
1895 | 1895 | |
|
1896 | 1896 | def makepatchmeta(backend, afile_orig, bfile_orig, hunk, strip, prefix): |
|
1897 | 1897 | nulla = afile_orig == b"/dev/null" |
|
1898 | 1898 | nullb = bfile_orig == b"/dev/null" |
|
1899 | 1899 | create = nulla and hunk.starta == 0 and hunk.lena == 0 |
|
1900 | 1900 | remove = nullb and hunk.startb == 0 and hunk.lenb == 0 |
|
1901 | 1901 | abase, afile = pathtransform(afile_orig, strip, prefix) |
|
1902 | 1902 | gooda = not nulla and backend.exists(afile) |
|
1903 | 1903 | bbase, bfile = pathtransform(bfile_orig, strip, prefix) |
|
1904 | 1904 | if afile == bfile: |
|
1905 | 1905 | goodb = gooda |
|
1906 | 1906 | else: |
|
1907 | 1907 | goodb = not nullb and backend.exists(bfile) |
|
1908 | 1908 | missing = not goodb and not gooda and not create |
|
1909 | 1909 | |
|
1910 | 1910 | # some diff programs apparently produce patches where the afile is |
|
1911 | 1911 | # not /dev/null, but afile starts with bfile |
|
1912 | 1912 | abasedir = afile[: afile.rfind(b'/') + 1] |
|
1913 | 1913 | bbasedir = bfile[: bfile.rfind(b'/') + 1] |
|
1914 | 1914 | if ( |
|
1915 | 1915 | missing |
|
1916 | 1916 | and abasedir == bbasedir |
|
1917 | 1917 | and afile.startswith(bfile) |
|
1918 | 1918 | and hunk.starta == 0 |
|
1919 | 1919 | and hunk.lena == 0 |
|
1920 | 1920 | ): |
|
1921 | 1921 | create = True |
|
1922 | 1922 | missing = False |
|
1923 | 1923 | |
|
1924 | 1924 | # If afile is "a/b/foo" and bfile is "a/b/foo.orig" we assume the |
|
1925 | 1925 | # diff is between a file and its backup. In this case, the original |
|
1926 | 1926 | # file should be patched (see original mpatch code). |
|
1927 | 1927 | isbackup = abase == bbase and bfile.startswith(afile) |
|
1928 | 1928 | fname = None |
|
1929 | 1929 | if not missing: |
|
1930 | 1930 | if gooda and goodb: |
|
1931 | 1931 | if isbackup: |
|
1932 | 1932 | fname = afile |
|
1933 | 1933 | else: |
|
1934 | 1934 | fname = bfile |
|
1935 | 1935 | elif gooda: |
|
1936 | 1936 | fname = afile |
|
1937 | 1937 | |
|
1938 | 1938 | if not fname: |
|
1939 | 1939 | if not nullb: |
|
1940 | 1940 | if isbackup: |
|
1941 | 1941 | fname = afile |
|
1942 | 1942 | else: |
|
1943 | 1943 | fname = bfile |
|
1944 | 1944 | elif not nulla: |
|
1945 | 1945 | fname = afile |
|
1946 | 1946 | else: |
|
1947 | 1947 | raise PatchError(_(b"undefined source and destination files")) |
|
1948 | 1948 | |
|
1949 | 1949 | gp = patchmeta(fname) |
|
1950 | 1950 | if create: |
|
1951 | 1951 | gp.op = b'ADD' |
|
1952 | 1952 | elif remove: |
|
1953 | 1953 | gp.op = b'DELETE' |
|
1954 | 1954 | return gp |
|
1955 | 1955 | |
|
1956 | 1956 | |
|
1957 | 1957 | def scanpatch(fp): |
|
1958 | 1958 | """like patch.iterhunks, but yield different events |
|
1959 | 1959 | |
|
1960 | 1960 | - ('file', [header_lines + fromfile + tofile]) |
|
1961 | 1961 | - ('context', [context_lines]) |
|
1962 | 1962 | - ('hunk', [hunk_lines]) |
|
1963 | 1963 | - ('range', (-start,len, +start,len, proc)) |
|
1964 | 1964 | """ |
|
1965 | 1965 | lines_re = re.compile(br'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
|
1966 | 1966 | lr = linereader(fp) |
|
1967 | 1967 | |
|
1968 | 1968 | def scanwhile(first, p): |
|
1969 | 1969 | """scan lr while predicate holds""" |
|
1970 | 1970 | lines = [first] |
|
1971 | 1971 | for line in iter(lr.readline, b''): |
|
1972 | 1972 | if p(line): |
|
1973 | 1973 | lines.append(line) |
|
1974 | 1974 | else: |
|
1975 | 1975 | lr.push(line) |
|
1976 | 1976 | break |
|
1977 | 1977 | return lines |
|
1978 | 1978 | |
|
1979 | 1979 | for line in iter(lr.readline, b''): |
|
1980 | 1980 | if line.startswith(b'diff --git a/') or line.startswith(b'diff -r '): |
|
1981 | 1981 | |
|
1982 | 1982 | def notheader(line): |
|
1983 | 1983 | s = line.split(None, 1) |
|
1984 | 1984 | return not s or s[0] not in (b'---', b'diff') |
|
1985 | 1985 | |
|
1986 | 1986 | header = scanwhile(line, notheader) |
|
1987 | 1987 | fromfile = lr.readline() |
|
1988 | 1988 | if fromfile.startswith(b'---'): |
|
1989 | 1989 | tofile = lr.readline() |
|
1990 | 1990 | header += [fromfile, tofile] |
|
1991 | 1991 | else: |
|
1992 | 1992 | lr.push(fromfile) |
|
1993 | 1993 | yield b'file', header |
|
1994 | 1994 | elif line.startswith(b' '): |
|
1995 | 1995 | cs = (b' ', b'\\') |
|
1996 | 1996 | yield b'context', scanwhile(line, lambda l: l.startswith(cs)) |
|
1997 | 1997 | elif line.startswith((b'-', b'+')): |
|
1998 | 1998 | cs = (b'-', b'+', b'\\') |
|
1999 | 1999 | yield b'hunk', scanwhile(line, lambda l: l.startswith(cs)) |
|
2000 | 2000 | else: |
|
2001 | 2001 | m = lines_re.match(line) |
|
2002 | 2002 | if m: |
|
2003 | 2003 | yield b'range', m.groups() |
|
2004 | 2004 | else: |
|
2005 | 2005 | yield b'other', line |
|
2006 | 2006 | |
|
2007 | 2007 | |
|
2008 | 2008 | def scangitpatch(lr, firstline): |
|
2009 | 2009 | """ |
|
2010 | 2010 | Git patches can emit: |
|
2011 | 2011 | - rename a to b |
|
2012 | 2012 | - change b |
|
2013 | 2013 | - copy a to c |
|
2014 | 2014 | - change c |
|
2015 | 2015 | |
|
2016 | 2016 | We cannot apply this sequence as-is, the renamed 'a' could not be |
|
2017 | 2017 | found for it would have been renamed already. And we cannot copy |
|
2018 | 2018 | from 'b' instead because 'b' would have been changed already. So |
|
2019 | 2019 | we scan the git patch for copy and rename commands so we can |
|
2020 | 2020 | perform the copies ahead of time. |
|
2021 | 2021 | """ |
|
2022 | 2022 | pos = 0 |
|
2023 | 2023 | try: |
|
2024 | 2024 | pos = lr.fp.tell() |
|
2025 | 2025 | fp = lr.fp |
|
2026 | 2026 | except IOError: |
|
2027 | 2027 | fp = stringio(lr.fp.read()) |
|
2028 | 2028 | gitlr = linereader(fp) |
|
2029 | 2029 | gitlr.push(firstline) |
|
2030 | 2030 | gitpatches = readgitpatch(gitlr) |
|
2031 | 2031 | fp.seek(pos) |
|
2032 | 2032 | return gitpatches |
|
2033 | 2033 | |
|
2034 | 2034 | |
|
2035 | 2035 | def iterhunks(fp): |
|
2036 | 2036 | """Read a patch and yield the following events: |
|
2037 | 2037 | - ("file", afile, bfile, firsthunk): select a new target file. |
|
2038 | 2038 | - ("hunk", hunk): a new hunk is ready to be applied, follows a |
|
2039 | 2039 | "file" event. |
|
2040 | 2040 | - ("git", gitchanges): current diff is in git format, gitchanges |
|
2041 | 2041 | maps filenames to gitpatch records. Unique event. |
|
2042 | 2042 | """ |
|
2043 | 2043 | afile = b"" |
|
2044 | 2044 | bfile = b"" |
|
2045 | 2045 | state = None |
|
2046 | 2046 | hunknum = 0 |
|
2047 | 2047 | emitfile = newfile = False |
|
2048 | 2048 | gitpatches = None |
|
2049 | 2049 | |
|
2050 | 2050 | # our states |
|
2051 | 2051 | BFILE = 1 |
|
2052 | 2052 | context = None |
|
2053 | 2053 | lr = linereader(fp) |
|
2054 | 2054 | |
|
2055 | 2055 | for x in iter(lr.readline, b''): |
|
2056 | 2056 | if state == BFILE and ( |
|
2057 | 2057 | (not context and x.startswith(b'@')) |
|
2058 | 2058 | or (context is not False and x.startswith(b'***************')) |
|
2059 | 2059 | or x.startswith(b'GIT binary patch') |
|
2060 | 2060 | ): |
|
2061 | 2061 | gp = None |
|
2062 | 2062 | if gitpatches and gitpatches[-1].ispatching(afile, bfile): |
|
2063 | 2063 | gp = gitpatches.pop() |
|
2064 | 2064 | if x.startswith(b'GIT binary patch'): |
|
2065 | 2065 | h = binhunk(lr, gp.path) |
|
2066 | 2066 | else: |
|
2067 | 2067 | if context is None and x.startswith(b'***************'): |
|
2068 | 2068 | context = True |
|
2069 | 2069 | h = hunk(x, hunknum + 1, lr, context) |
|
2070 | 2070 | hunknum += 1 |
|
2071 | 2071 | if emitfile: |
|
2072 | 2072 | emitfile = False |
|
2073 | 2073 | yield b'file', (afile, bfile, h, gp and gp.copy() or None) |
|
2074 | 2074 | yield b'hunk', h |
|
2075 | 2075 | elif x.startswith(b'diff --git a/'): |
|
2076 |
m = gitre.match(x.rstrip(b' |
|
|
2076 | m = gitre.match(x.rstrip(b'\r\n')) | |
|
2077 | 2077 | if not m: |
|
2078 | 2078 | continue |
|
2079 | 2079 | if gitpatches is None: |
|
2080 | 2080 | # scan whole input for git metadata |
|
2081 | 2081 | gitpatches = scangitpatch(lr, x) |
|
2082 | 2082 | yield b'git', [ |
|
2083 | 2083 | g.copy() for g in gitpatches if g.op in (b'COPY', b'RENAME') |
|
2084 | 2084 | ] |
|
2085 | 2085 | gitpatches.reverse() |
|
2086 | 2086 | afile = b'a/' + m.group(1) |
|
2087 | 2087 | bfile = b'b/' + m.group(2) |
|
2088 | 2088 | while gitpatches and not gitpatches[-1].ispatching(afile, bfile): |
|
2089 | 2089 | gp = gitpatches.pop() |
|
2090 | 2090 | yield b'file', ( |
|
2091 | 2091 | b'a/' + gp.path, |
|
2092 | 2092 | b'b/' + gp.path, |
|
2093 | 2093 | None, |
|
2094 | 2094 | gp.copy(), |
|
2095 | 2095 | ) |
|
2096 | 2096 | if not gitpatches: |
|
2097 | 2097 | raise PatchError( |
|
2098 | 2098 | _(b'failed to synchronize metadata for "%s"') % afile[2:] |
|
2099 | 2099 | ) |
|
2100 | 2100 | newfile = True |
|
2101 | 2101 | elif x.startswith(b'---'): |
|
2102 | 2102 | # check for a unified diff |
|
2103 | 2103 | l2 = lr.readline() |
|
2104 | 2104 | if not l2.startswith(b'+++'): |
|
2105 | 2105 | lr.push(l2) |
|
2106 | 2106 | continue |
|
2107 | 2107 | newfile = True |
|
2108 | 2108 | context = False |
|
2109 | 2109 | afile = parsefilename(x) |
|
2110 | 2110 | bfile = parsefilename(l2) |
|
2111 | 2111 | elif x.startswith(b'***'): |
|
2112 | 2112 | # check for a context diff |
|
2113 | 2113 | l2 = lr.readline() |
|
2114 | 2114 | if not l2.startswith(b'---'): |
|
2115 | 2115 | lr.push(l2) |
|
2116 | 2116 | continue |
|
2117 | 2117 | l3 = lr.readline() |
|
2118 | 2118 | lr.push(l3) |
|
2119 | 2119 | if not l3.startswith(b"***************"): |
|
2120 | 2120 | lr.push(l2) |
|
2121 | 2121 | continue |
|
2122 | 2122 | newfile = True |
|
2123 | 2123 | context = True |
|
2124 | 2124 | afile = parsefilename(x) |
|
2125 | 2125 | bfile = parsefilename(l2) |
|
2126 | 2126 | |
|
2127 | 2127 | if newfile: |
|
2128 | 2128 | newfile = False |
|
2129 | 2129 | emitfile = True |
|
2130 | 2130 | state = BFILE |
|
2131 | 2131 | hunknum = 0 |
|
2132 | 2132 | |
|
2133 | 2133 | while gitpatches: |
|
2134 | 2134 | gp = gitpatches.pop() |
|
2135 | 2135 | yield b'file', (b'a/' + gp.path, b'b/' + gp.path, None, gp.copy()) |
|
2136 | 2136 | |
|
2137 | 2137 | |
|
2138 | 2138 | def applybindelta(binchunk, data): |
|
2139 | 2139 | """Apply a binary delta hunk |
|
2140 | 2140 | The algorithm used is the algorithm from git's patch-delta.c |
|
2141 | 2141 | """ |
|
2142 | 2142 | |
|
2143 | 2143 | def deltahead(binchunk): |
|
2144 | 2144 | i = 0 |
|
2145 | 2145 | for c in pycompat.bytestr(binchunk): |
|
2146 | 2146 | i += 1 |
|
2147 | 2147 | if not (ord(c) & 0x80): |
|
2148 | 2148 | return i |
|
2149 | 2149 | return i |
|
2150 | 2150 | |
|
2151 | 2151 | out = b"" |
|
2152 | 2152 | s = deltahead(binchunk) |
|
2153 | 2153 | binchunk = binchunk[s:] |
|
2154 | 2154 | s = deltahead(binchunk) |
|
2155 | 2155 | binchunk = binchunk[s:] |
|
2156 | 2156 | i = 0 |
|
2157 | 2157 | while i < len(binchunk): |
|
2158 | 2158 | cmd = ord(binchunk[i : i + 1]) |
|
2159 | 2159 | i += 1 |
|
2160 | 2160 | if cmd & 0x80: |
|
2161 | 2161 | offset = 0 |
|
2162 | 2162 | size = 0 |
|
2163 | 2163 | if cmd & 0x01: |
|
2164 | 2164 | offset = ord(binchunk[i : i + 1]) |
|
2165 | 2165 | i += 1 |
|
2166 | 2166 | if cmd & 0x02: |
|
2167 | 2167 | offset |= ord(binchunk[i : i + 1]) << 8 |
|
2168 | 2168 | i += 1 |
|
2169 | 2169 | if cmd & 0x04: |
|
2170 | 2170 | offset |= ord(binchunk[i : i + 1]) << 16 |
|
2171 | 2171 | i += 1 |
|
2172 | 2172 | if cmd & 0x08: |
|
2173 | 2173 | offset |= ord(binchunk[i : i + 1]) << 24 |
|
2174 | 2174 | i += 1 |
|
2175 | 2175 | if cmd & 0x10: |
|
2176 | 2176 | size = ord(binchunk[i : i + 1]) |
|
2177 | 2177 | i += 1 |
|
2178 | 2178 | if cmd & 0x20: |
|
2179 | 2179 | size |= ord(binchunk[i : i + 1]) << 8 |
|
2180 | 2180 | i += 1 |
|
2181 | 2181 | if cmd & 0x40: |
|
2182 | 2182 | size |= ord(binchunk[i : i + 1]) << 16 |
|
2183 | 2183 | i += 1 |
|
2184 | 2184 | if size == 0: |
|
2185 | 2185 | size = 0x10000 |
|
2186 | 2186 | offset_end = offset + size |
|
2187 | 2187 | out += data[offset:offset_end] |
|
2188 | 2188 | elif cmd != 0: |
|
2189 | 2189 | offset_end = i + cmd |
|
2190 | 2190 | out += binchunk[i:offset_end] |
|
2191 | 2191 | i += cmd |
|
2192 | 2192 | else: |
|
2193 | 2193 | raise PatchError(_(b'unexpected delta opcode 0')) |
|
2194 | 2194 | return out |
|
2195 | 2195 | |
|
2196 | 2196 | |
|
2197 | 2197 | def applydiff(ui, fp, backend, store, strip=1, prefix=b'', eolmode=b'strict'): |
|
2198 | 2198 | """Reads a patch from fp and tries to apply it. |
|
2199 | 2199 | |
|
2200 | 2200 | Returns 0 for a clean patch, -1 if any rejects were found and 1 if |
|
2201 | 2201 | there was any fuzz. |
|
2202 | 2202 | |
|
2203 | 2203 | If 'eolmode' is 'strict', the patch content and patched file are |
|
2204 | 2204 | read in binary mode. Otherwise, line endings are ignored when |
|
2205 | 2205 | patching then normalized according to 'eolmode'. |
|
2206 | 2206 | """ |
|
2207 | 2207 | return _applydiff( |
|
2208 | 2208 | ui, |
|
2209 | 2209 | fp, |
|
2210 | 2210 | patchfile, |
|
2211 | 2211 | backend, |
|
2212 | 2212 | store, |
|
2213 | 2213 | strip=strip, |
|
2214 | 2214 | prefix=prefix, |
|
2215 | 2215 | eolmode=eolmode, |
|
2216 | 2216 | ) |
|
2217 | 2217 | |
|
2218 | 2218 | |
|
2219 | 2219 | def _canonprefix(repo, prefix): |
|
2220 | 2220 | if prefix: |
|
2221 | 2221 | prefix = pathutil.canonpath(repo.root, repo.getcwd(), prefix) |
|
2222 | 2222 | if prefix != b'': |
|
2223 | 2223 | prefix += b'/' |
|
2224 | 2224 | return prefix |
|
2225 | 2225 | |
|
2226 | 2226 | |
|
2227 | 2227 | def _applydiff( |
|
2228 | 2228 | ui, fp, patcher, backend, store, strip=1, prefix=b'', eolmode=b'strict' |
|
2229 | 2229 | ): |
|
2230 | 2230 | prefix = _canonprefix(backend.repo, prefix) |
|
2231 | 2231 | |
|
2232 | 2232 | def pstrip(p): |
|
2233 | 2233 | return pathtransform(p, strip - 1, prefix)[1] |
|
2234 | 2234 | |
|
2235 | 2235 | rejects = 0 |
|
2236 | 2236 | err = 0 |
|
2237 | 2237 | current_file = None |
|
2238 | 2238 | |
|
2239 | 2239 | for state, values in iterhunks(fp): |
|
2240 | 2240 | if state == b'hunk': |
|
2241 | 2241 | if not current_file: |
|
2242 | 2242 | continue |
|
2243 | 2243 | ret = current_file.apply(values) |
|
2244 | 2244 | if ret > 0: |
|
2245 | 2245 | err = 1 |
|
2246 | 2246 | elif state == b'file': |
|
2247 | 2247 | if current_file: |
|
2248 | 2248 | rejects += current_file.close() |
|
2249 | 2249 | current_file = None |
|
2250 | 2250 | afile, bfile, first_hunk, gp = values |
|
2251 | 2251 | if gp: |
|
2252 | 2252 | gp.path = pstrip(gp.path) |
|
2253 | 2253 | if gp.oldpath: |
|
2254 | 2254 | gp.oldpath = pstrip(gp.oldpath) |
|
2255 | 2255 | else: |
|
2256 | 2256 | gp = makepatchmeta( |
|
2257 | 2257 | backend, afile, bfile, first_hunk, strip, prefix |
|
2258 | 2258 | ) |
|
2259 | 2259 | if gp.op == b'RENAME': |
|
2260 | 2260 | backend.unlink(gp.oldpath) |
|
2261 | 2261 | if not first_hunk: |
|
2262 | 2262 | if gp.op == b'DELETE': |
|
2263 | 2263 | backend.unlink(gp.path) |
|
2264 | 2264 | continue |
|
2265 | 2265 | data, mode = None, None |
|
2266 | 2266 | if gp.op in (b'RENAME', b'COPY'): |
|
2267 | 2267 | data, mode = store.getfile(gp.oldpath)[:2] |
|
2268 | 2268 | if data is None: |
|
2269 | 2269 | # This means that the old path does not exist |
|
2270 | 2270 | raise PatchError( |
|
2271 | 2271 | _(b"source file '%s' does not exist") % gp.oldpath |
|
2272 | 2272 | ) |
|
2273 | 2273 | if gp.mode: |
|
2274 | 2274 | mode = gp.mode |
|
2275 | 2275 | if gp.op == b'ADD': |
|
2276 | 2276 | # Added files without content have no hunk and |
|
2277 | 2277 | # must be created |
|
2278 | 2278 | data = b'' |
|
2279 | 2279 | if data or mode: |
|
2280 | 2280 | if gp.op in (b'ADD', b'RENAME', b'COPY') and backend.exists( |
|
2281 | 2281 | gp.path |
|
2282 | 2282 | ): |
|
2283 | 2283 | raise PatchError( |
|
2284 | 2284 | _( |
|
2285 | 2285 | b"cannot create %s: destination " |
|
2286 | 2286 | b"already exists" |
|
2287 | 2287 | ) |
|
2288 | 2288 | % gp.path |
|
2289 | 2289 | ) |
|
2290 | 2290 | backend.setfile(gp.path, data, mode, gp.oldpath) |
|
2291 | 2291 | continue |
|
2292 | 2292 | try: |
|
2293 | 2293 | current_file = patcher(ui, gp, backend, store, eolmode=eolmode) |
|
2294 | 2294 | except PatchError as inst: |
|
2295 | 2295 | ui.warn(stringutil.forcebytestr(inst) + b'\n') |
|
2296 | 2296 | current_file = None |
|
2297 | 2297 | rejects += 1 |
|
2298 | 2298 | continue |
|
2299 | 2299 | elif state == b'git': |
|
2300 | 2300 | for gp in values: |
|
2301 | 2301 | path = pstrip(gp.oldpath) |
|
2302 | 2302 | data, mode = backend.getfile(path) |
|
2303 | 2303 | if data is None: |
|
2304 | 2304 | # The error ignored here will trigger a getfile() |
|
2305 | 2305 | # error in a place more appropriate for error |
|
2306 | 2306 | # handling, and will not interrupt the patching |
|
2307 | 2307 | # process. |
|
2308 | 2308 | pass |
|
2309 | 2309 | else: |
|
2310 | 2310 | store.setfile(path, data, mode) |
|
2311 | 2311 | else: |
|
2312 | 2312 | raise error.Abort(_(b'unsupported parser state: %s') % state) |
|
2313 | 2313 | |
|
2314 | 2314 | if current_file: |
|
2315 | 2315 | rejects += current_file.close() |
|
2316 | 2316 | |
|
2317 | 2317 | if rejects: |
|
2318 | 2318 | return -1 |
|
2319 | 2319 | return err |
|
2320 | 2320 | |
|
2321 | 2321 | |
|
2322 | 2322 | def _externalpatch(ui, repo, patcher, patchname, strip, files, similarity): |
|
2323 | 2323 | """use <patcher> to apply <patchname> to the working directory. |
|
2324 | 2324 | returns whether patch was applied with fuzz factor.""" |
|
2325 | 2325 | |
|
2326 | 2326 | fuzz = False |
|
2327 | 2327 | args = [] |
|
2328 | 2328 | cwd = repo.root |
|
2329 | 2329 | if cwd: |
|
2330 | 2330 | args.append(b'-d %s' % procutil.shellquote(cwd)) |
|
2331 | 2331 | cmd = b'%s %s -p%d < %s' % ( |
|
2332 | 2332 | patcher, |
|
2333 | 2333 | b' '.join(args), |
|
2334 | 2334 | strip, |
|
2335 | 2335 | procutil.shellquote(patchname), |
|
2336 | 2336 | ) |
|
2337 | 2337 | ui.debug(b'Using external patch tool: %s\n' % cmd) |
|
2338 | 2338 | fp = procutil.popen(cmd, b'rb') |
|
2339 | 2339 | try: |
|
2340 | 2340 | for line in util.iterfile(fp): |
|
2341 | 2341 | line = line.rstrip() |
|
2342 | 2342 | ui.note(line + b'\n') |
|
2343 | 2343 | if line.startswith(b'patching file '): |
|
2344 | 2344 | pf = util.parsepatchoutput(line) |
|
2345 | 2345 | printed_file = False |
|
2346 | 2346 | files.add(pf) |
|
2347 | 2347 | elif line.find(b'with fuzz') >= 0: |
|
2348 | 2348 | fuzz = True |
|
2349 | 2349 | if not printed_file: |
|
2350 | 2350 | ui.warn(pf + b'\n') |
|
2351 | 2351 | printed_file = True |
|
2352 | 2352 | ui.warn(line + b'\n') |
|
2353 | 2353 | elif line.find(b'saving rejects to file') >= 0: |
|
2354 | 2354 | ui.warn(line + b'\n') |
|
2355 | 2355 | elif line.find(b'FAILED') >= 0: |
|
2356 | 2356 | if not printed_file: |
|
2357 | 2357 | ui.warn(pf + b'\n') |
|
2358 | 2358 | printed_file = True |
|
2359 | 2359 | ui.warn(line + b'\n') |
|
2360 | 2360 | finally: |
|
2361 | 2361 | if files: |
|
2362 | 2362 | scmutil.marktouched(repo, files, similarity) |
|
2363 | 2363 | code = fp.close() |
|
2364 | 2364 | if code: |
|
2365 | 2365 | raise PatchError( |
|
2366 | 2366 | _(b"patch command failed: %s") % procutil.explainexit(code) |
|
2367 | 2367 | ) |
|
2368 | 2368 | return fuzz |
|
2369 | 2369 | |
|
2370 | 2370 | |
|
2371 | 2371 | def patchbackend( |
|
2372 | 2372 | ui, backend, patchobj, strip, prefix, files=None, eolmode=b'strict' |
|
2373 | 2373 | ): |
|
2374 | 2374 | if files is None: |
|
2375 | 2375 | files = set() |
|
2376 | 2376 | if eolmode is None: |
|
2377 | 2377 | eolmode = ui.config(b'patch', b'eol') |
|
2378 | 2378 | if eolmode.lower() not in eolmodes: |
|
2379 | 2379 | raise error.Abort(_(b'unsupported line endings type: %s') % eolmode) |
|
2380 | 2380 | eolmode = eolmode.lower() |
|
2381 | 2381 | |
|
2382 | 2382 | store = filestore() |
|
2383 | 2383 | try: |
|
2384 | 2384 | fp = open(patchobj, b'rb') |
|
2385 | 2385 | except TypeError: |
|
2386 | 2386 | fp = patchobj |
|
2387 | 2387 | try: |
|
2388 | 2388 | ret = applydiff( |
|
2389 | 2389 | ui, fp, backend, store, strip=strip, prefix=prefix, eolmode=eolmode |
|
2390 | 2390 | ) |
|
2391 | 2391 | finally: |
|
2392 | 2392 | if fp != patchobj: |
|
2393 | 2393 | fp.close() |
|
2394 | 2394 | files.update(backend.close()) |
|
2395 | 2395 | store.close() |
|
2396 | 2396 | if ret < 0: |
|
2397 | 2397 | raise PatchError(_(b'patch failed to apply')) |
|
2398 | 2398 | return ret > 0 |
|
2399 | 2399 | |
|
2400 | 2400 | |
|
2401 | 2401 | def internalpatch( |
|
2402 | 2402 | ui, |
|
2403 | 2403 | repo, |
|
2404 | 2404 | patchobj, |
|
2405 | 2405 | strip, |
|
2406 | 2406 | prefix=b'', |
|
2407 | 2407 | files=None, |
|
2408 | 2408 | eolmode=b'strict', |
|
2409 | 2409 | similarity=0, |
|
2410 | 2410 | ): |
|
2411 | 2411 | """use builtin patch to apply <patchobj> to the working directory. |
|
2412 | 2412 | returns whether patch was applied with fuzz factor.""" |
|
2413 | 2413 | backend = workingbackend(ui, repo, similarity) |
|
2414 | 2414 | return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) |
|
2415 | 2415 | |
|
2416 | 2416 | |
|
2417 | 2417 | def patchrepo( |
|
2418 | 2418 | ui, repo, ctx, store, patchobj, strip, prefix, files=None, eolmode=b'strict' |
|
2419 | 2419 | ): |
|
2420 | 2420 | backend = repobackend(ui, repo, ctx, store) |
|
2421 | 2421 | return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) |
|
2422 | 2422 | |
|
2423 | 2423 | |
|
2424 | 2424 | def patch( |
|
2425 | 2425 | ui, |
|
2426 | 2426 | repo, |
|
2427 | 2427 | patchname, |
|
2428 | 2428 | strip=1, |
|
2429 | 2429 | prefix=b'', |
|
2430 | 2430 | files=None, |
|
2431 | 2431 | eolmode=b'strict', |
|
2432 | 2432 | similarity=0, |
|
2433 | 2433 | ): |
|
2434 | 2434 | """Apply <patchname> to the working directory. |
|
2435 | 2435 | |
|
2436 | 2436 | 'eolmode' specifies how end of lines should be handled. It can be: |
|
2437 | 2437 | - 'strict': inputs are read in binary mode, EOLs are preserved |
|
2438 | 2438 | - 'crlf': EOLs are ignored when patching and reset to CRLF |
|
2439 | 2439 | - 'lf': EOLs are ignored when patching and reset to LF |
|
2440 | 2440 | - None: get it from user settings, default to 'strict' |
|
2441 | 2441 | 'eolmode' is ignored when using an external patcher program. |
|
2442 | 2442 | |
|
2443 | 2443 | Returns whether patch was applied with fuzz factor. |
|
2444 | 2444 | """ |
|
2445 | 2445 | patcher = ui.config(b'ui', b'patch') |
|
2446 | 2446 | if files is None: |
|
2447 | 2447 | files = set() |
|
2448 | 2448 | if patcher: |
|
2449 | 2449 | return _externalpatch( |
|
2450 | 2450 | ui, repo, patcher, patchname, strip, files, similarity |
|
2451 | 2451 | ) |
|
2452 | 2452 | return internalpatch( |
|
2453 | 2453 | ui, repo, patchname, strip, prefix, files, eolmode, similarity |
|
2454 | 2454 | ) |
|
2455 | 2455 | |
|
2456 | 2456 | |
|
2457 | 2457 | def changedfiles(ui, repo, patchpath, strip=1, prefix=b''): |
|
2458 | 2458 | backend = fsbackend(ui, repo.root) |
|
2459 | 2459 | prefix = _canonprefix(repo, prefix) |
|
2460 | 2460 | with open(patchpath, b'rb') as fp: |
|
2461 | 2461 | changed = set() |
|
2462 | 2462 | for state, values in iterhunks(fp): |
|
2463 | 2463 | if state == b'file': |
|
2464 | 2464 | afile, bfile, first_hunk, gp = values |
|
2465 | 2465 | if gp: |
|
2466 | 2466 | gp.path = pathtransform(gp.path, strip - 1, prefix)[1] |
|
2467 | 2467 | if gp.oldpath: |
|
2468 | 2468 | gp.oldpath = pathtransform( |
|
2469 | 2469 | gp.oldpath, strip - 1, prefix |
|
2470 | 2470 | )[1] |
|
2471 | 2471 | else: |
|
2472 | 2472 | gp = makepatchmeta( |
|
2473 | 2473 | backend, afile, bfile, first_hunk, strip, prefix |
|
2474 | 2474 | ) |
|
2475 | 2475 | changed.add(gp.path) |
|
2476 | 2476 | if gp.op == b'RENAME': |
|
2477 | 2477 | changed.add(gp.oldpath) |
|
2478 | 2478 | elif state not in (b'hunk', b'git'): |
|
2479 | 2479 | raise error.Abort(_(b'unsupported parser state: %s') % state) |
|
2480 | 2480 | return changed |
|
2481 | 2481 | |
|
2482 | 2482 | |
|
2483 | 2483 | class GitDiffRequired(Exception): |
|
2484 | 2484 | pass |
|
2485 | 2485 | |
|
2486 | 2486 | |
|
2487 | 2487 | diffopts = diffutil.diffallopts |
|
2488 | 2488 | diffallopts = diffutil.diffallopts |
|
2489 | 2489 | difffeatureopts = diffutil.difffeatureopts |
|
2490 | 2490 | |
|
2491 | 2491 | |
|
2492 | 2492 | def diff( |
|
2493 | 2493 | repo, |
|
2494 | 2494 | node1=None, |
|
2495 | 2495 | node2=None, |
|
2496 | 2496 | match=None, |
|
2497 | 2497 | changes=None, |
|
2498 | 2498 | opts=None, |
|
2499 | 2499 | losedatafn=None, |
|
2500 | 2500 | pathfn=None, |
|
2501 | 2501 | copy=None, |
|
2502 | 2502 | copysourcematch=None, |
|
2503 | 2503 | hunksfilterfn=None, |
|
2504 | 2504 | ): |
|
2505 | 2505 | """yields diff of changes to files between two nodes, or node and |
|
2506 | 2506 | working directory. |
|
2507 | 2507 | |
|
2508 | 2508 | if node1 is None, use first dirstate parent instead. |
|
2509 | 2509 | if node2 is None, compare node1 with working directory. |
|
2510 | 2510 | |
|
2511 | 2511 | losedatafn(**kwarg) is a callable run when opts.upgrade=True and |
|
2512 | 2512 | every time some change cannot be represented with the current |
|
2513 | 2513 | patch format. Return False to upgrade to git patch format, True to |
|
2514 | 2514 | accept the loss or raise an exception to abort the diff. It is |
|
2515 | 2515 | called with the name of current file being diffed as 'fn'. If set |
|
2516 | 2516 | to None, patches will always be upgraded to git format when |
|
2517 | 2517 | necessary. |
|
2518 | 2518 | |
|
2519 | 2519 | prefix is a filename prefix that is prepended to all filenames on |
|
2520 | 2520 | display (used for subrepos). |
|
2521 | 2521 | |
|
2522 | 2522 | relroot, if not empty, must be normalized with a trailing /. Any match |
|
2523 | 2523 | patterns that fall outside it will be ignored. |
|
2524 | 2524 | |
|
2525 | 2525 | copy, if not empty, should contain mappings {dst@y: src@x} of copy |
|
2526 | 2526 | information. |
|
2527 | 2527 | |
|
2528 | 2528 | if copysourcematch is not None, then copy sources will be filtered by this |
|
2529 | 2529 | matcher |
|
2530 | 2530 | |
|
2531 | 2531 | hunksfilterfn, if not None, should be a function taking a filectx and |
|
2532 | 2532 | hunks generator that may yield filtered hunks. |
|
2533 | 2533 | """ |
|
2534 | 2534 | if not node1 and not node2: |
|
2535 | 2535 | node1 = repo.dirstate.p1() |
|
2536 | 2536 | |
|
2537 | 2537 | ctx1 = repo[node1] |
|
2538 | 2538 | ctx2 = repo[node2] |
|
2539 | 2539 | |
|
2540 | 2540 | for fctx1, fctx2, hdr, hunks in diffhunks( |
|
2541 | 2541 | repo, |
|
2542 | 2542 | ctx1=ctx1, |
|
2543 | 2543 | ctx2=ctx2, |
|
2544 | 2544 | match=match, |
|
2545 | 2545 | changes=changes, |
|
2546 | 2546 | opts=opts, |
|
2547 | 2547 | losedatafn=losedatafn, |
|
2548 | 2548 | pathfn=pathfn, |
|
2549 | 2549 | copy=copy, |
|
2550 | 2550 | copysourcematch=copysourcematch, |
|
2551 | 2551 | ): |
|
2552 | 2552 | if hunksfilterfn is not None: |
|
2553 | 2553 | # If the file has been removed, fctx2 is None; but this should |
|
2554 | 2554 | # not occur here since we catch removed files early in |
|
2555 | 2555 | # logcmdutil.getlinerangerevs() for 'hg log -L'. |
|
2556 | 2556 | assert ( |
|
2557 | 2557 | fctx2 is not None |
|
2558 | 2558 | ), b'fctx2 unexpectly None in diff hunks filtering' |
|
2559 | 2559 | hunks = hunksfilterfn(fctx2, hunks) |
|
2560 | 2560 | text = b''.join(b''.join(hlines) for hrange, hlines in hunks) |
|
2561 | 2561 | if hdr and (text or len(hdr) > 1): |
|
2562 | 2562 | yield b'\n'.join(hdr) + b'\n' |
|
2563 | 2563 | if text: |
|
2564 | 2564 | yield text |
|
2565 | 2565 | |
|
2566 | 2566 | |
|
2567 | 2567 | def diffhunks( |
|
2568 | 2568 | repo, |
|
2569 | 2569 | ctx1, |
|
2570 | 2570 | ctx2, |
|
2571 | 2571 | match=None, |
|
2572 | 2572 | changes=None, |
|
2573 | 2573 | opts=None, |
|
2574 | 2574 | losedatafn=None, |
|
2575 | 2575 | pathfn=None, |
|
2576 | 2576 | copy=None, |
|
2577 | 2577 | copysourcematch=None, |
|
2578 | 2578 | ): |
|
2579 | 2579 | """Yield diff of changes to files in the form of (`header`, `hunks`) tuples |
|
2580 | 2580 | where `header` is a list of diff headers and `hunks` is an iterable of |
|
2581 | 2581 | (`hunkrange`, `hunklines`) tuples. |
|
2582 | 2582 | |
|
2583 | 2583 | See diff() for the meaning of parameters. |
|
2584 | 2584 | """ |
|
2585 | 2585 | |
|
2586 | 2586 | if opts is None: |
|
2587 | 2587 | opts = mdiff.defaultopts |
|
2588 | 2588 | |
|
2589 | 2589 | def lrugetfilectx(): |
|
2590 | 2590 | cache = {} |
|
2591 | 2591 | order = collections.deque() |
|
2592 | 2592 | |
|
2593 | 2593 | def getfilectx(f, ctx): |
|
2594 | 2594 | fctx = ctx.filectx(f, filelog=cache.get(f)) |
|
2595 | 2595 | if f not in cache: |
|
2596 | 2596 | if len(cache) > 20: |
|
2597 | 2597 | del cache[order.popleft()] |
|
2598 | 2598 | cache[f] = fctx.filelog() |
|
2599 | 2599 | else: |
|
2600 | 2600 | order.remove(f) |
|
2601 | 2601 | order.append(f) |
|
2602 | 2602 | return fctx |
|
2603 | 2603 | |
|
2604 | 2604 | return getfilectx |
|
2605 | 2605 | |
|
2606 | 2606 | getfilectx = lrugetfilectx() |
|
2607 | 2607 | |
|
2608 | 2608 | if not changes: |
|
2609 | 2609 | changes = ctx1.status(ctx2, match=match) |
|
2610 | 2610 | if isinstance(changes, list): |
|
2611 | 2611 | modified, added, removed = changes[:3] |
|
2612 | 2612 | else: |
|
2613 | 2613 | modified, added, removed = ( |
|
2614 | 2614 | changes.modified, |
|
2615 | 2615 | changes.added, |
|
2616 | 2616 | changes.removed, |
|
2617 | 2617 | ) |
|
2618 | 2618 | |
|
2619 | 2619 | if not modified and not added and not removed: |
|
2620 | 2620 | return [] |
|
2621 | 2621 | |
|
2622 | 2622 | if repo.ui.debugflag: |
|
2623 | 2623 | hexfunc = hex |
|
2624 | 2624 | else: |
|
2625 | 2625 | hexfunc = short |
|
2626 | 2626 | revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node] |
|
2627 | 2627 | |
|
2628 | 2628 | if copy is None: |
|
2629 | 2629 | copy = {} |
|
2630 | 2630 | if opts.git or opts.upgrade: |
|
2631 | 2631 | copy = copies.pathcopies(ctx1, ctx2, match=match) |
|
2632 | 2632 | |
|
2633 | 2633 | if copysourcematch: |
|
2634 | 2634 | # filter out copies where source side isn't inside the matcher |
|
2635 | 2635 | # (copies.pathcopies() already filtered out the destination) |
|
2636 | 2636 | copy = { |
|
2637 | 2637 | dst: src |
|
2638 | 2638 | for dst, src in pycompat.iteritems(copy) |
|
2639 | 2639 | if copysourcematch(src) |
|
2640 | 2640 | } |
|
2641 | 2641 | |
|
2642 | 2642 | modifiedset = set(modified) |
|
2643 | 2643 | addedset = set(added) |
|
2644 | 2644 | removedset = set(removed) |
|
2645 | 2645 | for f in modified: |
|
2646 | 2646 | if f not in ctx1: |
|
2647 | 2647 | # Fix up added, since merged-in additions appear as |
|
2648 | 2648 | # modifications during merges |
|
2649 | 2649 | modifiedset.remove(f) |
|
2650 | 2650 | addedset.add(f) |
|
2651 | 2651 | for f in removed: |
|
2652 | 2652 | if f not in ctx1: |
|
2653 | 2653 | # Merged-in additions that are then removed are reported as removed. |
|
2654 | 2654 | # They are not in ctx1, so We don't want to show them in the diff. |
|
2655 | 2655 | removedset.remove(f) |
|
2656 | 2656 | modified = sorted(modifiedset) |
|
2657 | 2657 | added = sorted(addedset) |
|
2658 | 2658 | removed = sorted(removedset) |
|
2659 | 2659 | for dst, src in list(copy.items()): |
|
2660 | 2660 | if src not in ctx1: |
|
2661 | 2661 | # Files merged in during a merge and then copied/renamed are |
|
2662 | 2662 | # reported as copies. We want to show them in the diff as additions. |
|
2663 | 2663 | del copy[dst] |
|
2664 | 2664 | |
|
2665 | 2665 | prefetchmatch = scmutil.matchfiles( |
|
2666 | 2666 | repo, list(modifiedset | addedset | removedset) |
|
2667 | 2667 | ) |
|
2668 | 2668 | revmatches = [ |
|
2669 | 2669 | (ctx1.rev(), prefetchmatch), |
|
2670 | 2670 | (ctx2.rev(), prefetchmatch), |
|
2671 | 2671 | ] |
|
2672 | 2672 | scmutil.prefetchfiles(repo, revmatches) |
|
2673 | 2673 | |
|
2674 | 2674 | def difffn(opts, losedata): |
|
2675 | 2675 | return trydiff( |
|
2676 | 2676 | repo, |
|
2677 | 2677 | revs, |
|
2678 | 2678 | ctx1, |
|
2679 | 2679 | ctx2, |
|
2680 | 2680 | modified, |
|
2681 | 2681 | added, |
|
2682 | 2682 | removed, |
|
2683 | 2683 | copy, |
|
2684 | 2684 | getfilectx, |
|
2685 | 2685 | opts, |
|
2686 | 2686 | losedata, |
|
2687 | 2687 | pathfn, |
|
2688 | 2688 | ) |
|
2689 | 2689 | |
|
2690 | 2690 | if opts.upgrade and not opts.git: |
|
2691 | 2691 | try: |
|
2692 | 2692 | |
|
2693 | 2693 | def losedata(fn): |
|
2694 | 2694 | if not losedatafn or not losedatafn(fn=fn): |
|
2695 | 2695 | raise GitDiffRequired |
|
2696 | 2696 | |
|
2697 | 2697 | # Buffer the whole output until we are sure it can be generated |
|
2698 | 2698 | return list(difffn(opts.copy(git=False), losedata)) |
|
2699 | 2699 | except GitDiffRequired: |
|
2700 | 2700 | return difffn(opts.copy(git=True), None) |
|
2701 | 2701 | else: |
|
2702 | 2702 | return difffn(opts, None) |
|
2703 | 2703 | |
|
2704 | 2704 | |
|
2705 | 2705 | def diffsinglehunk(hunklines): |
|
2706 | 2706 | """yield tokens for a list of lines in a single hunk""" |
|
2707 | 2707 | for line in hunklines: |
|
2708 | 2708 | # chomp |
|
2709 | 2709 | chompline = line.rstrip(b'\r\n') |
|
2710 | 2710 | # highlight tabs and trailing whitespace |
|
2711 | 2711 | stripline = chompline.rstrip() |
|
2712 | 2712 | if line.startswith(b'-'): |
|
2713 | 2713 | label = b'diff.deleted' |
|
2714 | 2714 | elif line.startswith(b'+'): |
|
2715 | 2715 | label = b'diff.inserted' |
|
2716 | 2716 | else: |
|
2717 | 2717 | raise error.ProgrammingError(b'unexpected hunk line: %s' % line) |
|
2718 | 2718 | for token in tabsplitter.findall(stripline): |
|
2719 | 2719 | if token.startswith(b'\t'): |
|
2720 | 2720 | yield (token, b'diff.tab') |
|
2721 | 2721 | else: |
|
2722 | 2722 | yield (token, label) |
|
2723 | 2723 | |
|
2724 | 2724 | if chompline != stripline: |
|
2725 | 2725 | yield (chompline[len(stripline) :], b'diff.trailingwhitespace') |
|
2726 | 2726 | if chompline != line: |
|
2727 | 2727 | yield (line[len(chompline) :], b'') |
|
2728 | 2728 | |
|
2729 | 2729 | |
|
2730 | 2730 | def diffsinglehunkinline(hunklines): |
|
2731 | 2731 | """yield tokens for a list of lines in a single hunk, with inline colors""" |
|
2732 | 2732 | # prepare deleted, and inserted content |
|
2733 | 2733 | a = bytearray() |
|
2734 | 2734 | b = bytearray() |
|
2735 | 2735 | for line in hunklines: |
|
2736 | 2736 | if line[0:1] == b'-': |
|
2737 | 2737 | a += line[1:] |
|
2738 | 2738 | elif line[0:1] == b'+': |
|
2739 | 2739 | b += line[1:] |
|
2740 | 2740 | else: |
|
2741 | 2741 | raise error.ProgrammingError(b'unexpected hunk line: %s' % line) |
|
2742 | 2742 | # fast path: if either side is empty, use diffsinglehunk |
|
2743 | 2743 | if not a or not b: |
|
2744 | 2744 | for t in diffsinglehunk(hunklines): |
|
2745 | 2745 | yield t |
|
2746 | 2746 | return |
|
2747 | 2747 | # re-split the content into words |
|
2748 | 2748 | al = wordsplitter.findall(bytes(a)) |
|
2749 | 2749 | bl = wordsplitter.findall(bytes(b)) |
|
2750 | 2750 | # re-arrange the words to lines since the diff algorithm is line-based |
|
2751 | 2751 | aln = [s if s == b'\n' else s + b'\n' for s in al] |
|
2752 | 2752 | bln = [s if s == b'\n' else s + b'\n' for s in bl] |
|
2753 | 2753 | an = b''.join(aln) |
|
2754 | 2754 | bn = b''.join(bln) |
|
2755 | 2755 | # run the diff algorithm, prepare atokens and btokens |
|
2756 | 2756 | atokens = [] |
|
2757 | 2757 | btokens = [] |
|
2758 | 2758 | blocks = mdiff.allblocks(an, bn, lines1=aln, lines2=bln) |
|
2759 | 2759 | for (a1, a2, b1, b2), btype in blocks: |
|
2760 | 2760 | changed = btype == b'!' |
|
2761 | 2761 | for token in mdiff.splitnewlines(b''.join(al[a1:a2])): |
|
2762 | 2762 | atokens.append((changed, token)) |
|
2763 | 2763 | for token in mdiff.splitnewlines(b''.join(bl[b1:b2])): |
|
2764 | 2764 | btokens.append((changed, token)) |
|
2765 | 2765 | |
|
2766 | 2766 | # yield deleted tokens, then inserted ones |
|
2767 | 2767 | for prefix, label, tokens in [ |
|
2768 | 2768 | (b'-', b'diff.deleted', atokens), |
|
2769 | 2769 | (b'+', b'diff.inserted', btokens), |
|
2770 | 2770 | ]: |
|
2771 | 2771 | nextisnewline = True |
|
2772 | 2772 | for changed, token in tokens: |
|
2773 | 2773 | if nextisnewline: |
|
2774 | 2774 | yield (prefix, label) |
|
2775 | 2775 | nextisnewline = False |
|
2776 | 2776 | # special handling line end |
|
2777 | 2777 | isendofline = token.endswith(b'\n') |
|
2778 | 2778 | if isendofline: |
|
2779 | 2779 | chomp = token[:-1] # chomp |
|
2780 | 2780 | if chomp.endswith(b'\r'): |
|
2781 | 2781 | chomp = chomp[:-1] |
|
2782 | 2782 | endofline = token[len(chomp) :] |
|
2783 | 2783 | token = chomp.rstrip() # detect spaces at the end |
|
2784 | 2784 | endspaces = chomp[len(token) :] |
|
2785 | 2785 | # scan tabs |
|
2786 | 2786 | for maybetab in tabsplitter.findall(token): |
|
2787 | 2787 | if b'\t' == maybetab[0:1]: |
|
2788 | 2788 | currentlabel = b'diff.tab' |
|
2789 | 2789 | else: |
|
2790 | 2790 | if changed: |
|
2791 | 2791 | currentlabel = label + b'.changed' |
|
2792 | 2792 | else: |
|
2793 | 2793 | currentlabel = label + b'.unchanged' |
|
2794 | 2794 | yield (maybetab, currentlabel) |
|
2795 | 2795 | if isendofline: |
|
2796 | 2796 | if endspaces: |
|
2797 | 2797 | yield (endspaces, b'diff.trailingwhitespace') |
|
2798 | 2798 | yield (endofline, b'') |
|
2799 | 2799 | nextisnewline = True |
|
2800 | 2800 | |
|
2801 | 2801 | |
|
2802 | 2802 | def difflabel(func, *args, **kw): |
|
2803 | 2803 | '''yields 2-tuples of (output, label) based on the output of func()''' |
|
2804 | 2804 | if kw.get('opts') and kw['opts'].worddiff: |
|
2805 | 2805 | dodiffhunk = diffsinglehunkinline |
|
2806 | 2806 | else: |
|
2807 | 2807 | dodiffhunk = diffsinglehunk |
|
2808 | 2808 | headprefixes = [ |
|
2809 | 2809 | (b'diff', b'diff.diffline'), |
|
2810 | 2810 | (b'copy', b'diff.extended'), |
|
2811 | 2811 | (b'rename', b'diff.extended'), |
|
2812 | 2812 | (b'old', b'diff.extended'), |
|
2813 | 2813 | (b'new', b'diff.extended'), |
|
2814 | 2814 | (b'deleted', b'diff.extended'), |
|
2815 | 2815 | (b'index', b'diff.extended'), |
|
2816 | 2816 | (b'similarity', b'diff.extended'), |
|
2817 | 2817 | (b'---', b'diff.file_a'), |
|
2818 | 2818 | (b'+++', b'diff.file_b'), |
|
2819 | 2819 | ] |
|
2820 | 2820 | textprefixes = [ |
|
2821 | 2821 | (b'@', b'diff.hunk'), |
|
2822 | 2822 | # - and + are handled by diffsinglehunk |
|
2823 | 2823 | ] |
|
2824 | 2824 | head = False |
|
2825 | 2825 | |
|
2826 | 2826 | # buffers a hunk, i.e. adjacent "-", "+" lines without other changes. |
|
2827 | 2827 | hunkbuffer = [] |
|
2828 | 2828 | |
|
2829 | 2829 | def consumehunkbuffer(): |
|
2830 | 2830 | if hunkbuffer: |
|
2831 | 2831 | for token in dodiffhunk(hunkbuffer): |
|
2832 | 2832 | yield token |
|
2833 | 2833 | hunkbuffer[:] = [] |
|
2834 | 2834 | |
|
2835 | 2835 | for chunk in func(*args, **kw): |
|
2836 | 2836 | lines = chunk.split(b'\n') |
|
2837 | 2837 | linecount = len(lines) |
|
2838 | 2838 | for i, line in enumerate(lines): |
|
2839 | 2839 | if head: |
|
2840 | 2840 | if line.startswith(b'@'): |
|
2841 | 2841 | head = False |
|
2842 | 2842 | else: |
|
2843 | 2843 | if line and not line.startswith( |
|
2844 | 2844 | (b' ', b'+', b'-', b'@', b'\\') |
|
2845 | 2845 | ): |
|
2846 | 2846 | head = True |
|
2847 | 2847 | diffline = False |
|
2848 | 2848 | if not head and line and line.startswith((b'+', b'-')): |
|
2849 | 2849 | diffline = True |
|
2850 | 2850 | |
|
2851 | 2851 | prefixes = textprefixes |
|
2852 | 2852 | if head: |
|
2853 | 2853 | prefixes = headprefixes |
|
2854 | 2854 | if diffline: |
|
2855 | 2855 | # buffered |
|
2856 | 2856 | bufferedline = line |
|
2857 | 2857 | if i + 1 < linecount: |
|
2858 | 2858 | bufferedline += b"\n" |
|
2859 | 2859 | hunkbuffer.append(bufferedline) |
|
2860 | 2860 | else: |
|
2861 | 2861 | # unbuffered |
|
2862 | 2862 | for token in consumehunkbuffer(): |
|
2863 | 2863 | yield token |
|
2864 | 2864 | stripline = line.rstrip() |
|
2865 | 2865 | for prefix, label in prefixes: |
|
2866 | 2866 | if stripline.startswith(prefix): |
|
2867 | 2867 | yield (stripline, label) |
|
2868 | 2868 | if line != stripline: |
|
2869 | 2869 | yield ( |
|
2870 | 2870 | line[len(stripline) :], |
|
2871 | 2871 | b'diff.trailingwhitespace', |
|
2872 | 2872 | ) |
|
2873 | 2873 | break |
|
2874 | 2874 | else: |
|
2875 | 2875 | yield (line, b'') |
|
2876 | 2876 | if i + 1 < linecount: |
|
2877 | 2877 | yield (b'\n', b'') |
|
2878 | 2878 | for token in consumehunkbuffer(): |
|
2879 | 2879 | yield token |
|
2880 | 2880 | |
|
2881 | 2881 | |
|
2882 | 2882 | def diffui(*args, **kw): |
|
2883 | 2883 | '''like diff(), but yields 2-tuples of (output, label) for ui.write()''' |
|
2884 | 2884 | return difflabel(diff, *args, **kw) |
|
2885 | 2885 | |
|
2886 | 2886 | |
|
2887 | 2887 | def _filepairs(modified, added, removed, copy, opts): |
|
2888 | 2888 | """generates tuples (f1, f2, copyop), where f1 is the name of the file |
|
2889 | 2889 | before and f2 is the the name after. For added files, f1 will be None, |
|
2890 | 2890 | and for removed files, f2 will be None. copyop may be set to None, 'copy' |
|
2891 | 2891 | or 'rename' (the latter two only if opts.git is set).""" |
|
2892 | 2892 | gone = set() |
|
2893 | 2893 | |
|
2894 | 2894 | copyto = {v: k for k, v in copy.items()} |
|
2895 | 2895 | |
|
2896 | 2896 | addedset, removedset = set(added), set(removed) |
|
2897 | 2897 | |
|
2898 | 2898 | for f in sorted(modified + added + removed): |
|
2899 | 2899 | copyop = None |
|
2900 | 2900 | f1, f2 = f, f |
|
2901 | 2901 | if f in addedset: |
|
2902 | 2902 | f1 = None |
|
2903 | 2903 | if f in copy: |
|
2904 | 2904 | if opts.git: |
|
2905 | 2905 | f1 = copy[f] |
|
2906 | 2906 | if f1 in removedset and f1 not in gone: |
|
2907 | 2907 | copyop = b'rename' |
|
2908 | 2908 | gone.add(f1) |
|
2909 | 2909 | else: |
|
2910 | 2910 | copyop = b'copy' |
|
2911 | 2911 | elif f in removedset: |
|
2912 | 2912 | f2 = None |
|
2913 | 2913 | if opts.git: |
|
2914 | 2914 | # have we already reported a copy above? |
|
2915 | 2915 | if ( |
|
2916 | 2916 | f in copyto |
|
2917 | 2917 | and copyto[f] in addedset |
|
2918 | 2918 | and copy[copyto[f]] == f |
|
2919 | 2919 | ): |
|
2920 | 2920 | continue |
|
2921 | 2921 | yield f1, f2, copyop |
|
2922 | 2922 | |
|
2923 | 2923 | |
|
2924 | 2924 | def _gitindex(text): |
|
2925 | 2925 | if not text: |
|
2926 | 2926 | text = b"" |
|
2927 | 2927 | l = len(text) |
|
2928 | 2928 | s = hashutil.sha1(b'blob %d\0' % l) |
|
2929 | 2929 | s.update(text) |
|
2930 | 2930 | return hex(s.digest()) |
|
2931 | 2931 | |
|
2932 | 2932 | |
|
2933 | 2933 | _gitmode = {b'l': b'120000', b'x': b'100755', b'': b'100644'} |
|
2934 | 2934 | |
|
2935 | 2935 | |
|
2936 | 2936 | def trydiff( |
|
2937 | 2937 | repo, |
|
2938 | 2938 | revs, |
|
2939 | 2939 | ctx1, |
|
2940 | 2940 | ctx2, |
|
2941 | 2941 | modified, |
|
2942 | 2942 | added, |
|
2943 | 2943 | removed, |
|
2944 | 2944 | copy, |
|
2945 | 2945 | getfilectx, |
|
2946 | 2946 | opts, |
|
2947 | 2947 | losedatafn, |
|
2948 | 2948 | pathfn, |
|
2949 | 2949 | ): |
|
2950 | 2950 | """given input data, generate a diff and yield it in blocks |
|
2951 | 2951 | |
|
2952 | 2952 | If generating a diff would lose data like flags or binary data and |
|
2953 | 2953 | losedatafn is not None, it will be called. |
|
2954 | 2954 | |
|
2955 | 2955 | pathfn is applied to every path in the diff output. |
|
2956 | 2956 | """ |
|
2957 | 2957 | |
|
2958 | 2958 | if opts.noprefix: |
|
2959 | 2959 | aprefix = bprefix = b'' |
|
2960 | 2960 | else: |
|
2961 | 2961 | aprefix = b'a/' |
|
2962 | 2962 | bprefix = b'b/' |
|
2963 | 2963 | |
|
2964 | 2964 | def diffline(f, revs): |
|
2965 | 2965 | revinfo = b' '.join([b"-r %s" % rev for rev in revs]) |
|
2966 | 2966 | return b'diff %s %s' % (revinfo, f) |
|
2967 | 2967 | |
|
2968 | 2968 | def isempty(fctx): |
|
2969 | 2969 | return fctx is None or fctx.size() == 0 |
|
2970 | 2970 | |
|
2971 | 2971 | date1 = dateutil.datestr(ctx1.date()) |
|
2972 | 2972 | date2 = dateutil.datestr(ctx2.date()) |
|
2973 | 2973 | |
|
2974 | 2974 | if not pathfn: |
|
2975 | 2975 | pathfn = lambda f: f |
|
2976 | 2976 | |
|
2977 | 2977 | for f1, f2, copyop in _filepairs(modified, added, removed, copy, opts): |
|
2978 | 2978 | content1 = None |
|
2979 | 2979 | content2 = None |
|
2980 | 2980 | fctx1 = None |
|
2981 | 2981 | fctx2 = None |
|
2982 | 2982 | flag1 = None |
|
2983 | 2983 | flag2 = None |
|
2984 | 2984 | if f1: |
|
2985 | 2985 | fctx1 = getfilectx(f1, ctx1) |
|
2986 | 2986 | if opts.git or losedatafn: |
|
2987 | 2987 | flag1 = ctx1.flags(f1) |
|
2988 | 2988 | if f2: |
|
2989 | 2989 | fctx2 = getfilectx(f2, ctx2) |
|
2990 | 2990 | if opts.git or losedatafn: |
|
2991 | 2991 | flag2 = ctx2.flags(f2) |
|
2992 | 2992 | # if binary is True, output "summary" or "base85", but not "text diff" |
|
2993 | 2993 | if opts.text: |
|
2994 | 2994 | binary = False |
|
2995 | 2995 | else: |
|
2996 | 2996 | binary = any(f.isbinary() for f in [fctx1, fctx2] if f is not None) |
|
2997 | 2997 | |
|
2998 | 2998 | if losedatafn and not opts.git: |
|
2999 | 2999 | if ( |
|
3000 | 3000 | binary |
|
3001 | 3001 | or |
|
3002 | 3002 | # copy/rename |
|
3003 | 3003 | f2 in copy |
|
3004 | 3004 | or |
|
3005 | 3005 | # empty file creation |
|
3006 | 3006 | (not f1 and isempty(fctx2)) |
|
3007 | 3007 | or |
|
3008 | 3008 | # empty file deletion |
|
3009 | 3009 | (isempty(fctx1) and not f2) |
|
3010 | 3010 | or |
|
3011 | 3011 | # create with flags |
|
3012 | 3012 | (not f1 and flag2) |
|
3013 | 3013 | or |
|
3014 | 3014 | # change flags |
|
3015 | 3015 | (f1 and f2 and flag1 != flag2) |
|
3016 | 3016 | ): |
|
3017 | 3017 | losedatafn(f2 or f1) |
|
3018 | 3018 | |
|
3019 | 3019 | path1 = pathfn(f1 or f2) |
|
3020 | 3020 | path2 = pathfn(f2 or f1) |
|
3021 | 3021 | header = [] |
|
3022 | 3022 | if opts.git: |
|
3023 | 3023 | header.append( |
|
3024 | 3024 | b'diff --git %s%s %s%s' % (aprefix, path1, bprefix, path2) |
|
3025 | 3025 | ) |
|
3026 | 3026 | if not f1: # added |
|
3027 | 3027 | header.append(b'new file mode %s' % _gitmode[flag2]) |
|
3028 | 3028 | elif not f2: # removed |
|
3029 | 3029 | header.append(b'deleted file mode %s' % _gitmode[flag1]) |
|
3030 | 3030 | else: # modified/copied/renamed |
|
3031 | 3031 | mode1, mode2 = _gitmode[flag1], _gitmode[flag2] |
|
3032 | 3032 | if mode1 != mode2: |
|
3033 | 3033 | header.append(b'old mode %s' % mode1) |
|
3034 | 3034 | header.append(b'new mode %s' % mode2) |
|
3035 | 3035 | if copyop is not None: |
|
3036 | 3036 | if opts.showsimilarity: |
|
3037 | 3037 | sim = similar.score(ctx1[path1], ctx2[path2]) * 100 |
|
3038 | 3038 | header.append(b'similarity index %d%%' % sim) |
|
3039 | 3039 | header.append(b'%s from %s' % (copyop, path1)) |
|
3040 | 3040 | header.append(b'%s to %s' % (copyop, path2)) |
|
3041 | 3041 | elif revs: |
|
3042 | 3042 | header.append(diffline(path1, revs)) |
|
3043 | 3043 | |
|
3044 | 3044 | # fctx.is | diffopts | what to | is fctx.data() |
|
3045 | 3045 | # binary() | text nobinary git index | output? | outputted? |
|
3046 | 3046 | # ------------------------------------|---------------------------- |
|
3047 | 3047 | # yes | no no no * | summary | no |
|
3048 | 3048 | # yes | no no yes * | base85 | yes |
|
3049 | 3049 | # yes | no yes no * | summary | no |
|
3050 | 3050 | # yes | no yes yes 0 | summary | no |
|
3051 | 3051 | # yes | no yes yes >0 | summary | semi [1] |
|
3052 | 3052 | # yes | yes * * * | text diff | yes |
|
3053 | 3053 | # no | * * * * | text diff | yes |
|
3054 | 3054 | # [1]: hash(fctx.data()) is outputted. so fctx.data() cannot be faked |
|
3055 | 3055 | if binary and ( |
|
3056 | 3056 | not opts.git or (opts.git and opts.nobinary and not opts.index) |
|
3057 | 3057 | ): |
|
3058 | 3058 | # fast path: no binary content will be displayed, content1 and |
|
3059 | 3059 | # content2 are only used for equivalent test. cmp() could have a |
|
3060 | 3060 | # fast path. |
|
3061 | 3061 | if fctx1 is not None: |
|
3062 | 3062 | content1 = b'\0' |
|
3063 | 3063 | if fctx2 is not None: |
|
3064 | 3064 | if fctx1 is not None and not fctx1.cmp(fctx2): |
|
3065 | 3065 | content2 = b'\0' # not different |
|
3066 | 3066 | else: |
|
3067 | 3067 | content2 = b'\0\0' |
|
3068 | 3068 | else: |
|
3069 | 3069 | # normal path: load contents |
|
3070 | 3070 | if fctx1 is not None: |
|
3071 | 3071 | content1 = fctx1.data() |
|
3072 | 3072 | if fctx2 is not None: |
|
3073 | 3073 | content2 = fctx2.data() |
|
3074 | 3074 | |
|
3075 | 3075 | data1 = (ctx1, fctx1, path1, flag1, content1, date1) |
|
3076 | 3076 | data2 = (ctx2, fctx2, path2, flag2, content2, date2) |
|
3077 | 3077 | yield diffcontent(data1, data2, header, binary, opts) |
|
3078 | 3078 | |
|
3079 | 3079 | |
|
3080 | 3080 | def diffcontent(data1, data2, header, binary, opts): |
|
3081 | 3081 | """diffs two versions of a file. |
|
3082 | 3082 | |
|
3083 | 3083 | data1 and data2 are tuples containg: |
|
3084 | 3084 | |
|
3085 | 3085 | * ctx: changeset for the file |
|
3086 | 3086 | * fctx: file context for that file |
|
3087 | 3087 | * path1: name of the file |
|
3088 | 3088 | * flag: flags of the file |
|
3089 | 3089 | * content: full content of the file (can be null in case of binary) |
|
3090 | 3090 | * date: date of the changeset |
|
3091 | 3091 | |
|
3092 | 3092 | header: the patch header |
|
3093 | 3093 | binary: whether the any of the version of file is binary or not |
|
3094 | 3094 | opts: user passed options |
|
3095 | 3095 | |
|
3096 | 3096 | It exists as a separate function so that extensions like extdiff can wrap |
|
3097 | 3097 | it and use the file content directly. |
|
3098 | 3098 | """ |
|
3099 | 3099 | |
|
3100 | 3100 | ctx1, fctx1, path1, flag1, content1, date1 = data1 |
|
3101 | 3101 | ctx2, fctx2, path2, flag2, content2, date2 = data2 |
|
3102 | 3102 | if binary and opts.git and not opts.nobinary: |
|
3103 | 3103 | text = mdiff.b85diff(content1, content2) |
|
3104 | 3104 | if text: |
|
3105 | 3105 | header.append( |
|
3106 | 3106 | b'index %s..%s' % (_gitindex(content1), _gitindex(content2)) |
|
3107 | 3107 | ) |
|
3108 | 3108 | hunks = ((None, [text]),) |
|
3109 | 3109 | else: |
|
3110 | 3110 | if opts.git and opts.index > 0: |
|
3111 | 3111 | flag = flag1 |
|
3112 | 3112 | if flag is None: |
|
3113 | 3113 | flag = flag2 |
|
3114 | 3114 | header.append( |
|
3115 | 3115 | b'index %s..%s %s' |
|
3116 | 3116 | % ( |
|
3117 | 3117 | _gitindex(content1)[0 : opts.index], |
|
3118 | 3118 | _gitindex(content2)[0 : opts.index], |
|
3119 | 3119 | _gitmode[flag], |
|
3120 | 3120 | ) |
|
3121 | 3121 | ) |
|
3122 | 3122 | |
|
3123 | 3123 | uheaders, hunks = mdiff.unidiff( |
|
3124 | 3124 | content1, |
|
3125 | 3125 | date1, |
|
3126 | 3126 | content2, |
|
3127 | 3127 | date2, |
|
3128 | 3128 | path1, |
|
3129 | 3129 | path2, |
|
3130 | 3130 | binary=binary, |
|
3131 | 3131 | opts=opts, |
|
3132 | 3132 | ) |
|
3133 | 3133 | header.extend(uheaders) |
|
3134 | 3134 | return fctx1, fctx2, header, hunks |
|
3135 | 3135 | |
|
3136 | 3136 | |
|
3137 | 3137 | def diffstatsum(stats): |
|
3138 | 3138 | maxfile, maxtotal, addtotal, removetotal, binary = 0, 0, 0, 0, False |
|
3139 | 3139 | for f, a, r, b in stats: |
|
3140 | 3140 | maxfile = max(maxfile, encoding.colwidth(f)) |
|
3141 | 3141 | maxtotal = max(maxtotal, a + r) |
|
3142 | 3142 | addtotal += a |
|
3143 | 3143 | removetotal += r |
|
3144 | 3144 | binary = binary or b |
|
3145 | 3145 | |
|
3146 | 3146 | return maxfile, maxtotal, addtotal, removetotal, binary |
|
3147 | 3147 | |
|
3148 | 3148 | |
|
3149 | 3149 | def diffstatdata(lines): |
|
3150 | 3150 | diffre = re.compile(br'^diff .*-r [a-z0-9]+\s(.*)$') |
|
3151 | 3151 | |
|
3152 | 3152 | results = [] |
|
3153 | 3153 | filename, adds, removes, isbinary = None, 0, 0, False |
|
3154 | 3154 | |
|
3155 | 3155 | def addresult(): |
|
3156 | 3156 | if filename: |
|
3157 | 3157 | results.append((filename, adds, removes, isbinary)) |
|
3158 | 3158 | |
|
3159 | 3159 | # inheader is used to track if a line is in the |
|
3160 | 3160 | # header portion of the diff. This helps properly account |
|
3161 | 3161 | # for lines that start with '--' or '++' |
|
3162 | 3162 | inheader = False |
|
3163 | 3163 | |
|
3164 | 3164 | for line in lines: |
|
3165 | 3165 | if line.startswith(b'diff'): |
|
3166 | 3166 | addresult() |
|
3167 | 3167 | # starting a new file diff |
|
3168 | 3168 | # set numbers to 0 and reset inheader |
|
3169 | 3169 | inheader = True |
|
3170 | 3170 | adds, removes, isbinary = 0, 0, False |
|
3171 | 3171 | if line.startswith(b'diff --git a/'): |
|
3172 | 3172 | filename = gitre.search(line).group(2) |
|
3173 | 3173 | elif line.startswith(b'diff -r'): |
|
3174 | 3174 | # format: "diff -r ... -r ... filename" |
|
3175 | 3175 | filename = diffre.search(line).group(1) |
|
3176 | 3176 | elif line.startswith(b'@@'): |
|
3177 | 3177 | inheader = False |
|
3178 | 3178 | elif line.startswith(b'+') and not inheader: |
|
3179 | 3179 | adds += 1 |
|
3180 | 3180 | elif line.startswith(b'-') and not inheader: |
|
3181 | 3181 | removes += 1 |
|
3182 | 3182 | elif line.startswith(b'GIT binary patch') or line.startswith( |
|
3183 | 3183 | b'Binary file' |
|
3184 | 3184 | ): |
|
3185 | 3185 | isbinary = True |
|
3186 | 3186 | elif line.startswith(b'rename from'): |
|
3187 | 3187 | filename = line[12:] |
|
3188 | 3188 | elif line.startswith(b'rename to'): |
|
3189 | 3189 | filename += b' => %s' % line[10:] |
|
3190 | 3190 | addresult() |
|
3191 | 3191 | return results |
|
3192 | 3192 | |
|
3193 | 3193 | |
|
3194 | 3194 | def diffstat(lines, width=80): |
|
3195 | 3195 | output = [] |
|
3196 | 3196 | stats = diffstatdata(lines) |
|
3197 | 3197 | maxname, maxtotal, totaladds, totalremoves, hasbinary = diffstatsum(stats) |
|
3198 | 3198 | |
|
3199 | 3199 | countwidth = len(str(maxtotal)) |
|
3200 | 3200 | if hasbinary and countwidth < 3: |
|
3201 | 3201 | countwidth = 3 |
|
3202 | 3202 | graphwidth = width - countwidth - maxname - 6 |
|
3203 | 3203 | if graphwidth < 10: |
|
3204 | 3204 | graphwidth = 10 |
|
3205 | 3205 | |
|
3206 | 3206 | def scale(i): |
|
3207 | 3207 | if maxtotal <= graphwidth: |
|
3208 | 3208 | return i |
|
3209 | 3209 | # If diffstat runs out of room it doesn't print anything, |
|
3210 | 3210 | # which isn't very useful, so always print at least one + or - |
|
3211 | 3211 | # if there were at least some changes. |
|
3212 | 3212 | return max(i * graphwidth // maxtotal, int(bool(i))) |
|
3213 | 3213 | |
|
3214 | 3214 | for filename, adds, removes, isbinary in stats: |
|
3215 | 3215 | if isbinary: |
|
3216 | 3216 | count = b'Bin' |
|
3217 | 3217 | else: |
|
3218 | 3218 | count = b'%d' % (adds + removes) |
|
3219 | 3219 | pluses = b'+' * scale(adds) |
|
3220 | 3220 | minuses = b'-' * scale(removes) |
|
3221 | 3221 | output.append( |
|
3222 | 3222 | b' %s%s | %*s %s%s\n' |
|
3223 | 3223 | % ( |
|
3224 | 3224 | filename, |
|
3225 | 3225 | b' ' * (maxname - encoding.colwidth(filename)), |
|
3226 | 3226 | countwidth, |
|
3227 | 3227 | count, |
|
3228 | 3228 | pluses, |
|
3229 | 3229 | minuses, |
|
3230 | 3230 | ) |
|
3231 | 3231 | ) |
|
3232 | 3232 | |
|
3233 | 3233 | if stats: |
|
3234 | 3234 | output.append( |
|
3235 | 3235 | _(b' %d files changed, %d insertions(+), %d deletions(-)\n') |
|
3236 | 3236 | % (len(stats), totaladds, totalremoves) |
|
3237 | 3237 | ) |
|
3238 | 3238 | |
|
3239 | 3239 | return b''.join(output) |
|
3240 | 3240 | |
|
3241 | 3241 | |
|
3242 | 3242 | def diffstatui(*args, **kw): |
|
3243 | 3243 | """like diffstat(), but yields 2-tuples of (output, label) for |
|
3244 | 3244 | ui.write() |
|
3245 | 3245 | """ |
|
3246 | 3246 | |
|
3247 | 3247 | for line in diffstat(*args, **kw).splitlines(): |
|
3248 | 3248 | if line and line[-1] in b'+-': |
|
3249 | 3249 | name, graph = line.rsplit(b' ', 1) |
|
3250 | 3250 | yield (name + b' ', b'') |
|
3251 | 3251 | m = re.search(br'\++', graph) |
|
3252 | 3252 | if m: |
|
3253 | 3253 | yield (m.group(0), b'diffstat.inserted') |
|
3254 | 3254 | m = re.search(br'-+', graph) |
|
3255 | 3255 | if m: |
|
3256 | 3256 | yield (m.group(0), b'diffstat.deleted') |
|
3257 | 3257 | else: |
|
3258 | 3258 | yield (line, b'') |
|
3259 | 3259 | yield (b'\n', b'') |
@@ -1,1514 +1,1537 b'' | |||
|
1 | 1 | #testcases stripbased phasebased |
|
2 | 2 | |
|
3 | 3 | $ cat <<EOF >> $HGRCPATH |
|
4 | 4 | > [extensions] |
|
5 | 5 | > mq = |
|
6 | 6 | > [defaults] |
|
7 | 7 | > diff = --nodates --git |
|
8 | 8 | > qnew = --date '0 0' |
|
9 | 9 | > [shelve] |
|
10 | 10 | > maxbackups = 2 |
|
11 | 11 | > EOF |
|
12 | 12 | |
|
13 | 13 | #if phasebased |
|
14 | 14 | |
|
15 | 15 | $ cat <<EOF >> $HGRCPATH |
|
16 | 16 | > [format] |
|
17 | 17 | > internal-phase = yes |
|
18 | 18 | > EOF |
|
19 | 19 | |
|
20 | 20 | #endif |
|
21 | 21 | |
|
22 | 22 | $ hg init repo |
|
23 | 23 | $ cd repo |
|
24 | 24 | $ mkdir a b |
|
25 | 25 | $ echo a > a/a |
|
26 | 26 | $ echo b > b/b |
|
27 | 27 | $ echo c > c |
|
28 | 28 | $ echo d > d |
|
29 | 29 | $ echo x > x |
|
30 | 30 | $ hg addremove -q |
|
31 | 31 | |
|
32 | 32 | shelve has a help message |
|
33 | 33 | $ hg shelve -h |
|
34 | 34 | hg shelve [OPTION]... [FILE]... |
|
35 | 35 | |
|
36 | 36 | save and set aside changes from the working directory |
|
37 | 37 | |
|
38 | 38 | Shelving takes files that "hg status" reports as not clean, saves the |
|
39 | 39 | modifications to a bundle (a shelved change), and reverts the files so |
|
40 | 40 | that their state in the working directory becomes clean. |
|
41 | 41 | |
|
42 | 42 | To restore these changes to the working directory, using "hg unshelve"; |
|
43 | 43 | this will work even if you switch to a different commit. |
|
44 | 44 | |
|
45 | 45 | When no files are specified, "hg shelve" saves all not-clean files. If |
|
46 | 46 | specific files or directories are named, only changes to those files are |
|
47 | 47 | shelved. |
|
48 | 48 | |
|
49 | 49 | In bare shelve (when no files are specified, without interactive, include |
|
50 | 50 | and exclude option), shelving remembers information if the working |
|
51 | 51 | directory was on newly created branch, in other words working directory |
|
52 | 52 | was on different branch than its first parent. In this situation |
|
53 | 53 | unshelving restores branch information to the working directory. |
|
54 | 54 | |
|
55 | 55 | Each shelved change has a name that makes it easier to find later. The |
|
56 | 56 | name of a shelved change defaults to being based on the active bookmark, |
|
57 | 57 | or if there is no active bookmark, the current named branch. To specify a |
|
58 | 58 | different name, use "--name". |
|
59 | 59 | |
|
60 | 60 | To see a list of existing shelved changes, use the "--list" option. For |
|
61 | 61 | each shelved change, this will print its name, age, and description; use " |
|
62 | 62 | --patch" or "--stat" for more details. |
|
63 | 63 | |
|
64 | 64 | To delete specific shelved changes, use "--delete". To delete all shelved |
|
65 | 65 | changes, use "--cleanup". |
|
66 | 66 | |
|
67 | 67 | options ([+] can be repeated): |
|
68 | 68 | |
|
69 | 69 | -A --addremove mark new/missing files as added/removed before |
|
70 | 70 | shelving |
|
71 | 71 | -u --unknown store unknown files in the shelve |
|
72 | 72 | --cleanup delete all shelved changes |
|
73 | 73 | --date DATE shelve with the specified commit date |
|
74 | 74 | -d --delete delete the named shelved change(s) |
|
75 | 75 | -e --edit invoke editor on commit messages |
|
76 | 76 | -k --keep shelve, but keep changes in the working directory |
|
77 | 77 | -l --list list current shelves |
|
78 | 78 | -m --message TEXT use text as shelve message |
|
79 | 79 | -n --name NAME use the given name for the shelved commit |
|
80 | 80 | -p --patch output patches for changes (provide the names of the |
|
81 | 81 | shelved changes as positional arguments) |
|
82 | 82 | -i --interactive interactive mode |
|
83 | 83 | --stat output diffstat-style summary of changes (provide |
|
84 | 84 | the names of the shelved changes as positional |
|
85 | 85 | arguments) |
|
86 | 86 | -I --include PATTERN [+] include names matching the given patterns |
|
87 | 87 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
88 | 88 | --mq operate on patch repository |
|
89 | 89 | |
|
90 | 90 | (some details hidden, use --verbose to show complete help) |
|
91 | 91 | |
|
92 | 92 | shelving in an empty repo should be possible |
|
93 | 93 | (this tests also that editor is not invoked, if '--edit' is not |
|
94 | 94 | specified) |
|
95 | 95 | |
|
96 | 96 | $ HGEDITOR=cat hg shelve |
|
97 | 97 | shelved as default |
|
98 | 98 | 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
|
99 | 99 | |
|
100 | 100 | $ hg unshelve |
|
101 | 101 | unshelving change 'default' |
|
102 | 102 | |
|
103 | 103 | $ hg commit -q -m 'initial commit' |
|
104 | 104 | |
|
105 | 105 | $ hg shelve |
|
106 | 106 | nothing changed |
|
107 | 107 | [1] |
|
108 | 108 | |
|
109 | 109 | make sure shelve files were backed up |
|
110 | 110 | |
|
111 | 111 | $ ls .hg/shelve-backup |
|
112 | 112 | default.hg |
|
113 | 113 | default.patch |
|
114 | 114 | default.shelve |
|
115 | 115 | |
|
116 | 116 | checks to make sure we dont create a directory or |
|
117 | 117 | hidden file while choosing a new shelve name |
|
118 | 118 | |
|
119 | 119 | when we are given a name |
|
120 | 120 | |
|
121 | 121 | $ hg shelve -n foo/bar |
|
122 | 122 | abort: shelved change names can not contain slashes |
|
123 | 123 | [255] |
|
124 | 124 | $ hg shelve -n .baz |
|
125 | 125 | abort: shelved change names can not start with '.' |
|
126 | 126 | [255] |
|
127 | 127 | $ hg shelve -n foo\\bar |
|
128 | 128 | abort: shelved change names can not contain slashes |
|
129 | 129 | [255] |
|
130 | 130 | |
|
131 | 131 | when shelve has to choose itself |
|
132 | 132 | |
|
133 | 133 | $ hg branch x/y -q |
|
134 | 134 | $ hg commit -q -m "Branch commit 0" |
|
135 | 135 | $ hg shelve |
|
136 | 136 | nothing changed |
|
137 | 137 | [1] |
|
138 | 138 | $ hg branch .x -q |
|
139 | 139 | $ hg commit -q -m "Branch commit 1" |
|
140 | 140 | $ hg shelve |
|
141 | 141 | nothing changed |
|
142 | 142 | [1] |
|
143 | 143 | $ hg branch x\\y -q |
|
144 | 144 | $ hg commit -q -m "Branch commit 2" |
|
145 | 145 | $ hg shelve |
|
146 | 146 | nothing changed |
|
147 | 147 | [1] |
|
148 | 148 | |
|
149 | 149 | cleaning the branches made for name checking tests |
|
150 | 150 | |
|
151 | 151 | $ hg up default -q |
|
152 | 152 | $ hg strip e9177275307e+6a6d231f43d+882bae7c62c2 -q |
|
153 | 153 | |
|
154 | 154 | create an mq patch - shelving should work fine with a patch applied |
|
155 | 155 | |
|
156 | 156 | $ echo n > n |
|
157 | 157 | $ hg add n |
|
158 | 158 | $ hg commit n -m second |
|
159 | 159 | $ hg qnew second.patch |
|
160 | 160 | |
|
161 | 161 | shelve a change that we will delete later |
|
162 | 162 | |
|
163 | 163 | $ echo a >> a/a |
|
164 | 164 | $ hg shelve |
|
165 | 165 | shelved as default |
|
166 | 166 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 | 167 | |
|
168 | 168 | set up some more complex changes to shelve |
|
169 | 169 | |
|
170 | 170 | $ echo a >> a/a |
|
171 | 171 | $ hg mv b b.rename |
|
172 | 172 | moving b/b to b.rename/b |
|
173 | 173 | $ hg cp c c.copy |
|
174 | 174 | $ hg mv d ghost |
|
175 | 175 | $ rm ghost |
|
176 | 176 | $ hg status -C |
|
177 | 177 | M a/a |
|
178 | 178 | A b.rename/b |
|
179 | 179 | b/b |
|
180 | 180 | A c.copy |
|
181 | 181 | c |
|
182 | 182 | R b/b |
|
183 | 183 | R d |
|
184 | 184 | ! ghost |
|
185 | 185 | d |
|
186 | 186 | |
|
187 | 187 | the common case - no options or filenames |
|
188 | 188 | |
|
189 | 189 | $ hg shelve |
|
190 | 190 | shelved as default-01 |
|
191 | 191 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
192 | 192 | $ hg status -C |
|
193 | 193 | |
|
194 | 194 | ensure that our shelved changes exist |
|
195 | 195 | |
|
196 | 196 | $ hg shelve -l |
|
197 | 197 | default-01 (*)* changes to: [mq]: second.patch (glob) |
|
198 | 198 | default (*)* changes to: [mq]: second.patch (glob) |
|
199 | 199 | |
|
200 | 200 | $ hg shelve -l -p default |
|
201 | 201 | default (*)* changes to: [mq]: second.patch (glob) |
|
202 | 202 | |
|
203 | 203 | diff --git a/a/a b/a/a |
|
204 | 204 | --- a/a/a |
|
205 | 205 | +++ b/a/a |
|
206 | 206 | @@ -1,1 +1,2 @@ |
|
207 | 207 | a |
|
208 | 208 | +a |
|
209 | 209 | |
|
210 | 210 | $ hg shelve --list --addremove |
|
211 | 211 | abort: options '--list' and '--addremove' may not be used together |
|
212 | 212 | [10] |
|
213 | 213 | |
|
214 | 214 | delete our older shelved change |
|
215 | 215 | |
|
216 | 216 | $ hg shelve -d default |
|
217 | 217 | $ hg qfinish -a -q |
|
218 | 218 | |
|
219 | 219 | ensure shelve backups aren't overwritten |
|
220 | 220 | |
|
221 | 221 | $ ls .hg/shelve-backup/ |
|
222 | 222 | default-1.hg |
|
223 | 223 | default-1.patch |
|
224 | 224 | default-1.shelve |
|
225 | 225 | default.hg |
|
226 | 226 | default.patch |
|
227 | 227 | default.shelve |
|
228 | 228 | |
|
229 | 229 | local edits should not prevent a shelved change from applying |
|
230 | 230 | |
|
231 | 231 | $ printf "z\na\n" > a/a |
|
232 | 232 | $ hg unshelve --keep |
|
233 | 233 | unshelving change 'default-01' |
|
234 | 234 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
235 | 235 | rebasing shelved changes |
|
236 | 236 | merging a/a |
|
237 | 237 | |
|
238 | 238 | $ hg revert --all -q |
|
239 | 239 | $ rm a/a.orig b.rename/b c.copy |
|
240 | 240 | |
|
241 | 241 | apply it and make sure our state is as expected |
|
242 | 242 | |
|
243 | 243 | (this also tests that same timestamp prevents backups from being |
|
244 | 244 | removed, even though there are more than 'maxbackups' backups) |
|
245 | 245 | |
|
246 | 246 | $ f -t .hg/shelve-backup/default.patch |
|
247 | 247 | .hg/shelve-backup/default.patch: file |
|
248 | 248 | $ touch -t 200001010000 .hg/shelve-backup/default.patch |
|
249 | 249 | $ f -t .hg/shelve-backup/default-1.patch |
|
250 | 250 | .hg/shelve-backup/default-1.patch: file |
|
251 | 251 | $ touch -t 200001010000 .hg/shelve-backup/default-1.patch |
|
252 | 252 | |
|
253 | 253 | $ hg unshelve |
|
254 | 254 | unshelving change 'default-01' |
|
255 | 255 | $ hg status -C |
|
256 | 256 | M a/a |
|
257 | 257 | A b.rename/b |
|
258 | 258 | b/b |
|
259 | 259 | A c.copy |
|
260 | 260 | c |
|
261 | 261 | R b/b |
|
262 | 262 | R d |
|
263 | 263 | $ hg shelve -l |
|
264 | 264 | |
|
265 | 265 | (both of default.hg and default-1.hg should be still kept, because it |
|
266 | 266 | is difficult to decide actual order of them from same timestamp) |
|
267 | 267 | |
|
268 | 268 | $ ls .hg/shelve-backup/ |
|
269 | 269 | default-01.hg |
|
270 | 270 | default-01.patch |
|
271 | 271 | default-01.shelve |
|
272 | 272 | default-1.hg |
|
273 | 273 | default-1.patch |
|
274 | 274 | default-1.shelve |
|
275 | 275 | default.hg |
|
276 | 276 | default.patch |
|
277 | 277 | default.shelve |
|
278 | 278 | |
|
279 | 279 | $ hg unshelve |
|
280 | 280 | abort: no shelved changes to apply! |
|
281 | 281 | [255] |
|
282 | 282 | $ hg unshelve foo |
|
283 | 283 | abort: shelved change 'foo' not found |
|
284 | 284 | [255] |
|
285 | 285 | |
|
286 | 286 | named shelves, specific filenames, and "commit messages" should all work |
|
287 | 287 | (this tests also that editor is invoked, if '--edit' is specified) |
|
288 | 288 | |
|
289 | 289 | $ hg status -C |
|
290 | 290 | M a/a |
|
291 | 291 | A b.rename/b |
|
292 | 292 | b/b |
|
293 | 293 | A c.copy |
|
294 | 294 | c |
|
295 | 295 | R b/b |
|
296 | 296 | R d |
|
297 | 297 | $ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a |
|
298 | 298 | wat |
|
299 | 299 | |
|
300 | 300 | |
|
301 | 301 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
302 | 302 | HG: Leave message empty to abort commit. |
|
303 | 303 | HG: -- |
|
304 | 304 | HG: user: shelve@localhost |
|
305 | 305 | HG: branch 'default' |
|
306 | 306 | HG: changed a/a |
|
307 | 307 | |
|
308 | 308 | expect "a" to no longer be present, but status otherwise unchanged |
|
309 | 309 | |
|
310 | 310 | $ hg status -C |
|
311 | 311 | A b.rename/b |
|
312 | 312 | b/b |
|
313 | 313 | A c.copy |
|
314 | 314 | c |
|
315 | 315 | R b/b |
|
316 | 316 | R d |
|
317 | 317 | $ hg shelve -l --stat |
|
318 | 318 | wibble (*) wat (glob) |
|
319 | 319 | a/a | 1 + |
|
320 | 320 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
321 | 321 | |
|
322 | 322 | and now "a/a" should reappear |
|
323 | 323 | |
|
324 | 324 | $ cd a |
|
325 | 325 | $ hg unshelve -q wibble |
|
326 | 326 | $ cd .. |
|
327 | 327 | $ hg status -C |
|
328 | 328 | M a/a |
|
329 | 329 | A b.rename/b |
|
330 | 330 | b/b |
|
331 | 331 | A c.copy |
|
332 | 332 | c |
|
333 | 333 | R b/b |
|
334 | 334 | R d |
|
335 | 335 | |
|
336 | 336 | ensure old shelve backups are being deleted automatically |
|
337 | 337 | |
|
338 | 338 | $ ls .hg/shelve-backup/ |
|
339 | 339 | default-01.hg |
|
340 | 340 | default-01.patch |
|
341 | 341 | default-01.shelve |
|
342 | 342 | wibble.hg |
|
343 | 343 | wibble.patch |
|
344 | 344 | wibble.shelve |
|
345 | 345 | |
|
346 | 346 | cause unshelving to result in a merge with 'a' conflicting |
|
347 | 347 | |
|
348 | 348 | $ hg shelve -q |
|
349 | 349 | $ echo c>>a/a |
|
350 | 350 | $ hg commit -m second |
|
351 | 351 | $ hg tip --template '{files}\n' |
|
352 | 352 | a/a |
|
353 | 353 | |
|
354 | 354 | add an unrelated change that should be preserved |
|
355 | 355 | |
|
356 | 356 | $ mkdir foo |
|
357 | 357 | $ echo foo > foo/foo |
|
358 | 358 | $ hg add foo/foo |
|
359 | 359 | |
|
360 | 360 | force a conflicted merge to occur |
|
361 | 361 | |
|
362 | 362 | $ hg unshelve |
|
363 | 363 | unshelving change 'default' |
|
364 | 364 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
365 | 365 | rebasing shelved changes |
|
366 | 366 | merging a/a |
|
367 | 367 | warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') |
|
368 | 368 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
369 | 369 | [240] |
|
370 | 370 | $ hg status -v |
|
371 | 371 | M a/a |
|
372 | 372 | M b.rename/b |
|
373 | 373 | M c.copy |
|
374 | 374 | R b/b |
|
375 | 375 | R d |
|
376 | 376 | ? a/a.orig |
|
377 | 377 | # The repository is in an unfinished *unshelve* state. |
|
378 | 378 | |
|
379 | 379 | # Unresolved merge conflicts: |
|
380 | 380 | # |
|
381 | 381 | # a/a |
|
382 | 382 | # |
|
383 | 383 | # To mark files as resolved: hg resolve --mark FILE |
|
384 | 384 | |
|
385 | 385 | # To continue: hg unshelve --continue |
|
386 | 386 | # To abort: hg unshelve --abort |
|
387 | 387 | |
|
388 | 388 | |
|
389 | 389 | ensure that we have a merge with unresolved conflicts |
|
390 | 390 | |
|
391 | 391 | #if phasebased |
|
392 | 392 | $ hg heads -q --template '{rev}\n' |
|
393 | 393 | 8 |
|
394 | 394 | 5 |
|
395 | 395 | $ hg parents -q --template '{rev}\n' |
|
396 | 396 | 8 |
|
397 | 397 | 5 |
|
398 | 398 | #endif |
|
399 | 399 | |
|
400 | 400 | #if stripbased |
|
401 | 401 | $ hg heads -q --template '{rev}\n' |
|
402 | 402 | 5 |
|
403 | 403 | 4 |
|
404 | 404 | $ hg parents -q --template '{rev}\n' |
|
405 | 405 | 4 |
|
406 | 406 | 5 |
|
407 | 407 | #endif |
|
408 | 408 | |
|
409 | 409 | $ hg status |
|
410 | 410 | M a/a |
|
411 | 411 | M b.rename/b |
|
412 | 412 | M c.copy |
|
413 | 413 | R b/b |
|
414 | 414 | R d |
|
415 | 415 | ? a/a.orig |
|
416 | 416 | $ hg diff |
|
417 | 417 | diff --git a/a/a b/a/a |
|
418 | 418 | --- a/a/a |
|
419 | 419 | +++ b/a/a |
|
420 | 420 | @@ -1,2 +1,6 @@ |
|
421 | 421 | a |
|
422 | 422 | +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit |
|
423 | 423 | c |
|
424 | 424 | +======= |
|
425 | 425 | +a |
|
426 | 426 | +>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch |
|
427 | 427 | diff --git a/b/b b/b.rename/b |
|
428 | 428 | rename from b/b |
|
429 | 429 | rename to b.rename/b |
|
430 | 430 | diff --git a/c b/c.copy |
|
431 | 431 | copy from c |
|
432 | 432 | copy to c.copy |
|
433 | 433 | diff --git a/d b/d |
|
434 | 434 | deleted file mode 100644 |
|
435 | 435 | --- a/d |
|
436 | 436 | +++ /dev/null |
|
437 | 437 | @@ -1,1 +0,0 @@ |
|
438 | 438 | -d |
|
439 | 439 | $ hg resolve -l |
|
440 | 440 | U a/a |
|
441 | 441 | |
|
442 | 442 | $ hg shelve |
|
443 | 443 | abort: unshelve already in progress |
|
444 | 444 | (use 'hg unshelve --continue' or 'hg unshelve --abort') |
|
445 | 445 | [20] |
|
446 | 446 | |
|
447 | 447 | abort the unshelve and be happy |
|
448 | 448 | |
|
449 | 449 | $ hg status |
|
450 | 450 | M a/a |
|
451 | 451 | M b.rename/b |
|
452 | 452 | M c.copy |
|
453 | 453 | R b/b |
|
454 | 454 | R d |
|
455 | 455 | ? a/a.orig |
|
456 | 456 | $ hg unshelve -a |
|
457 | 457 | unshelve of 'default' aborted |
|
458 | 458 | $ hg heads -q |
|
459 | 459 | [37]:2e69b451d1ea (re) |
|
460 | 460 | $ hg parents |
|
461 | 461 | changeset: [37]:2e69b451d1ea (re) |
|
462 | 462 | tag: tip |
|
463 | 463 | parent: 3:509104101065 (?) |
|
464 | 464 | user: test |
|
465 | 465 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
466 | 466 | summary: second |
|
467 | 467 | |
|
468 | 468 | $ hg resolve -l |
|
469 | 469 | $ hg status |
|
470 | 470 | A foo/foo |
|
471 | 471 | ? a/a.orig |
|
472 | 472 | |
|
473 | 473 | try to continue with no unshelve underway |
|
474 | 474 | |
|
475 | 475 | $ hg unshelve -c |
|
476 | 476 | abort: no unshelve in progress |
|
477 | 477 | [20] |
|
478 | 478 | $ hg status |
|
479 | 479 | A foo/foo |
|
480 | 480 | ? a/a.orig |
|
481 | 481 | |
|
482 | 482 | redo the unshelve to get a conflict |
|
483 | 483 | |
|
484 | 484 | $ hg unshelve -q |
|
485 | 485 | warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') |
|
486 | 486 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
487 | 487 | [240] |
|
488 | 488 | |
|
489 | 489 | attempt to continue |
|
490 | 490 | |
|
491 | 491 | $ hg unshelve -c |
|
492 | 492 | abort: unresolved conflicts, can't continue |
|
493 | 493 | (see 'hg resolve', then 'hg unshelve --continue') |
|
494 | 494 | [255] |
|
495 | 495 | |
|
496 | 496 | $ hg revert -r . a/a |
|
497 | 497 | $ hg resolve -m a/a |
|
498 | 498 | (no more unresolved files) |
|
499 | 499 | continue: hg unshelve --continue |
|
500 | 500 | |
|
501 | 501 | $ hg commit -m 'commit while unshelve in progress' |
|
502 | 502 | abort: unshelve already in progress |
|
503 | 503 | (use 'hg unshelve --continue' or 'hg unshelve --abort') |
|
504 | 504 | [20] |
|
505 | 505 | |
|
506 | 506 | $ hg graft --continue |
|
507 | 507 | abort: no graft in progress |
|
508 | 508 | (continue: hg unshelve --continue) |
|
509 | 509 | [20] |
|
510 | 510 | $ hg unshelve -c |
|
511 | 511 | unshelve of 'default' complete |
|
512 | 512 | |
|
513 | 513 | ensure the repo is as we hope |
|
514 | 514 | |
|
515 | 515 | $ hg parents |
|
516 | 516 | changeset: [37]:2e69b451d1ea (re) |
|
517 | 517 | tag: tip |
|
518 | 518 | parent: 3:509104101065 (?) |
|
519 | 519 | user: test |
|
520 | 520 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
521 | 521 | summary: second |
|
522 | 522 | |
|
523 | 523 | $ hg heads -q |
|
524 | 524 | [37]:2e69b451d1ea (re) |
|
525 | 525 | |
|
526 | 526 | $ hg status -C |
|
527 | 527 | A b.rename/b |
|
528 | 528 | b/b |
|
529 | 529 | A c.copy |
|
530 | 530 | c |
|
531 | 531 | A foo/foo |
|
532 | 532 | R b/b |
|
533 | 533 | R d |
|
534 | 534 | ? a/a.orig |
|
535 | 535 | |
|
536 | 536 | there should be no shelves left |
|
537 | 537 | |
|
538 | 538 | $ hg shelve -l |
|
539 | 539 | |
|
540 | 540 | #if execbit |
|
541 | 541 | |
|
542 | 542 | ensure that metadata-only changes are shelved |
|
543 | 543 | |
|
544 | 544 | $ chmod +x a/a |
|
545 | 545 | $ hg shelve -q -n execbit a/a |
|
546 | 546 | $ hg status a/a |
|
547 | 547 | $ hg unshelve -q execbit |
|
548 | 548 | $ hg status a/a |
|
549 | 549 | M a/a |
|
550 | 550 | $ hg revert a/a |
|
551 | 551 | |
|
552 | 552 | #else |
|
553 | 553 | |
|
554 | 554 | Dummy shelve op, to keep rev numbers aligned |
|
555 | 555 | |
|
556 | 556 | $ echo foo > a/a |
|
557 | 557 | $ hg shelve -q -n dummy a/a |
|
558 | 558 | $ hg unshelve -q dummy |
|
559 | 559 | $ hg revert a/a |
|
560 | 560 | |
|
561 | 561 | #endif |
|
562 | 562 | |
|
563 | 563 | #if symlink |
|
564 | 564 | |
|
565 | 565 | $ rm a/a |
|
566 | 566 | $ ln -s foo a/a |
|
567 | 567 | $ hg shelve -q -n symlink a/a |
|
568 | 568 | $ hg status a/a |
|
569 | 569 | $ hg unshelve -q -n symlink |
|
570 | 570 | $ hg status a/a |
|
571 | 571 | M a/a |
|
572 | 572 | $ hg revert a/a |
|
573 | 573 | |
|
574 | 574 | #else |
|
575 | 575 | |
|
576 | 576 | Dummy shelve op, to keep rev numbers aligned |
|
577 | 577 | |
|
578 | 578 | $ echo bar > a/a |
|
579 | 579 | $ hg shelve -q -n dummy a/a |
|
580 | 580 | $ hg unshelve -q dummy |
|
581 | 581 | $ hg revert a/a |
|
582 | 582 | |
|
583 | 583 | #endif |
|
584 | 584 | |
|
585 | 585 | set up another conflict between a commit and a shelved change |
|
586 | 586 | |
|
587 | 587 | $ hg revert -q -C -a |
|
588 | 588 | $ rm a/a.orig b.rename/b c.copy |
|
589 | 589 | $ echo a >> a/a |
|
590 | 590 | $ hg shelve -q |
|
591 | 591 | $ echo x >> a/a |
|
592 | 592 | $ hg ci -m 'create conflict' |
|
593 | 593 | $ hg add foo/foo |
|
594 | 594 | |
|
595 | 595 | if we resolve a conflict while unshelving, the unshelve should succeed |
|
596 | 596 | |
|
597 | 597 | $ hg unshelve --tool :merge-other --keep |
|
598 | 598 | unshelving change 'default' |
|
599 | 599 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
600 | 600 | rebasing shelved changes |
|
601 | 601 | merging a/a |
|
602 | 602 | $ hg parents -q |
|
603 | 603 | (4|13):33f7f61e6c5e (re) |
|
604 | 604 | $ hg shelve -l |
|
605 | 605 | default (*)* changes to: second (glob) |
|
606 | 606 | $ hg status |
|
607 | 607 | M a/a |
|
608 | 608 | A foo/foo |
|
609 | 609 | $ cat a/a |
|
610 | 610 | a |
|
611 | 611 | c |
|
612 | 612 | a |
|
613 | 613 | $ cat > a/a << EOF |
|
614 | 614 | > a |
|
615 | 615 | > c |
|
616 | 616 | > x |
|
617 | 617 | > EOF |
|
618 | 618 | |
|
619 | 619 | $ HGMERGE=true hg unshelve |
|
620 | 620 | unshelving change 'default' |
|
621 | 621 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
622 | 622 | rebasing shelved changes |
|
623 | 623 | merging a/a |
|
624 | 624 | note: unshelved changes already existed in the working copy |
|
625 | 625 | $ hg parents -q |
|
626 | 626 | (4|13):33f7f61e6c5e (re) |
|
627 | 627 | $ hg shelve -l |
|
628 | 628 | $ hg status |
|
629 | 629 | A foo/foo |
|
630 | 630 | $ cat a/a |
|
631 | 631 | a |
|
632 | 632 | c |
|
633 | 633 | x |
|
634 | 634 | |
|
635 | 635 | test keep and cleanup |
|
636 | 636 | |
|
637 | 637 | $ hg shelve |
|
638 | 638 | shelved as default |
|
639 | 639 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
640 | 640 | $ hg shelve --list |
|
641 | 641 | default (*)* changes to: create conflict (glob) |
|
642 | 642 | $ hg unshelve -k |
|
643 | 643 | unshelving change 'default' |
|
644 | 644 | $ hg shelve --list |
|
645 | 645 | default (*)* changes to: create conflict (glob) |
|
646 | 646 | $ hg shelve --cleanup |
|
647 | 647 | $ hg shelve --list |
|
648 | 648 | |
|
649 | 649 | $ hg shelve --cleanup --delete |
|
650 | 650 | abort: options '--cleanup' and '--delete' may not be used together |
|
651 | 651 | [10] |
|
652 | 652 | $ hg shelve --cleanup --patch |
|
653 | 653 | abort: options '--cleanup' and '--patch' may not be used together |
|
654 | 654 | [10] |
|
655 | 655 | $ hg shelve --cleanup --message MESSAGE |
|
656 | 656 | abort: options '--cleanup' and '--message' may not be used together |
|
657 | 657 | [10] |
|
658 | 658 | |
|
659 | 659 | test bookmarks |
|
660 | 660 | |
|
661 | 661 | $ hg bookmark test |
|
662 | 662 | $ hg bookmark |
|
663 | 663 | \* test (4|13):33f7f61e6c5e (re) |
|
664 | 664 | $ hg shelve |
|
665 | 665 | shelved as test |
|
666 | 666 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
667 | 667 | $ hg bookmark |
|
668 | 668 | \* test (4|13):33f7f61e6c5e (re) |
|
669 | 669 | $ hg unshelve |
|
670 | 670 | unshelving change 'test' |
|
671 | 671 | $ hg bookmark |
|
672 | 672 | \* test (4|13):33f7f61e6c5e (re) |
|
673 | 673 | |
|
674 | 674 | shelve should still work even if mq is disabled |
|
675 | 675 | |
|
676 | 676 | $ hg --config extensions.mq=! shelve |
|
677 | 677 | shelved as test |
|
678 | 678 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
679 | 679 | $ hg --config extensions.mq=! shelve --list |
|
680 | 680 | test (*)* changes to: create conflict (glob) |
|
681 | 681 | $ hg bookmark |
|
682 | 682 | \* test (4|13):33f7f61e6c5e (re) |
|
683 | 683 | $ hg --config extensions.mq=! unshelve |
|
684 | 684 | unshelving change 'test' |
|
685 | 685 | $ hg bookmark |
|
686 | 686 | \* test (4|13):33f7f61e6c5e (re) |
|
687 | 687 | |
|
688 | 688 | Recreate some conflict again |
|
689 | 689 | |
|
690 | 690 | $ hg up -C -r 2e69b451d1ea |
|
691 | 691 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
692 | 692 | (leaving bookmark test) |
|
693 | 693 | $ echo y >> a/a |
|
694 | 694 | $ hg shelve |
|
695 | 695 | shelved as default |
|
696 | 696 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
697 | 697 | $ hg up test |
|
698 | 698 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
699 | 699 | (activating bookmark test) |
|
700 | 700 | $ hg bookmark |
|
701 | 701 | \* test (4|13):33f7f61e6c5e (re) |
|
702 | 702 | $ hg unshelve |
|
703 | 703 | unshelving change 'default' |
|
704 | 704 | rebasing shelved changes |
|
705 | 705 | merging a/a |
|
706 | 706 | warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') |
|
707 | 707 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
708 | 708 | [240] |
|
709 | 709 | $ hg bookmark |
|
710 | 710 | test (4|13):33f7f61e6c5e (re) |
|
711 | 711 | |
|
712 | 712 | Test that resolving all conflicts in one direction (so that the rebase |
|
713 | 713 | is a no-op), works (issue4398) |
|
714 | 714 | |
|
715 | 715 | $ hg revert -a -r . |
|
716 | 716 | reverting a/a |
|
717 | 717 | $ hg resolve -m a/a |
|
718 | 718 | (no more unresolved files) |
|
719 | 719 | continue: hg unshelve --continue |
|
720 | 720 | $ hg unshelve -c |
|
721 | 721 | note: unshelved changes already existed in the working copy |
|
722 | 722 | unshelve of 'default' complete |
|
723 | 723 | $ hg bookmark |
|
724 | 724 | \* test (4|13):33f7f61e6c5e (re) |
|
725 | 725 | $ hg diff |
|
726 | 726 | $ hg status |
|
727 | 727 | ? a/a.orig |
|
728 | 728 | ? foo/foo |
|
729 | 729 | $ hg summary |
|
730 | 730 | parent: (4|13):33f7f61e6c5e tip (re) |
|
731 | 731 | create conflict |
|
732 | 732 | branch: default |
|
733 | 733 | bookmarks: *test |
|
734 | 734 | commit: 2 unknown (clean) |
|
735 | 735 | update: (current) |
|
736 | 736 | phases: 5 draft |
|
737 | 737 | |
|
738 | 738 | $ hg shelve --delete --stat |
|
739 | 739 | abort: options '--delete' and '--stat' may not be used together |
|
740 | 740 | [10] |
|
741 | 741 | $ hg shelve --delete --name NAME |
|
742 | 742 | abort: options '--delete' and '--name' may not be used together |
|
743 | 743 | [10] |
|
744 | 744 | |
|
745 | 745 | Test interactive shelve |
|
746 | 746 | $ cat <<EOF >> $HGRCPATH |
|
747 | 747 | > [ui] |
|
748 | 748 | > interactive = true |
|
749 | 749 | > EOF |
|
750 | 750 | $ echo 'a' >> a/b |
|
751 | 751 | $ cat a/a >> a/b |
|
752 | 752 | $ echo 'x' >> a/b |
|
753 | 753 | $ mv a/b a/a |
|
754 | 754 | $ echo 'a' >> foo/foo |
|
755 | 755 | $ hg st |
|
756 | 756 | M a/a |
|
757 | 757 | ? a/a.orig |
|
758 | 758 | ? foo/foo |
|
759 | 759 | $ cat a/a |
|
760 | 760 | a |
|
761 | 761 | a |
|
762 | 762 | c |
|
763 | 763 | x |
|
764 | 764 | x |
|
765 | 765 | $ cat foo/foo |
|
766 | 766 | foo |
|
767 | 767 | a |
|
768 | 768 | $ hg shelve --interactive --config ui.interactive=false |
|
769 | 769 | abort: running non-interactively |
|
770 | 770 | [10] |
|
771 | 771 | $ hg shelve --interactive << EOF |
|
772 | 772 | > y |
|
773 | 773 | > y |
|
774 | 774 | > n |
|
775 | 775 | > EOF |
|
776 | 776 | diff --git a/a/a b/a/a |
|
777 | 777 | 2 hunks, 2 lines changed |
|
778 | 778 | examine changes to 'a/a'? |
|
779 | 779 | (enter ? for help) [Ynesfdaq?] y |
|
780 | 780 | |
|
781 | 781 | @@ -1,3 +1,4 @@ |
|
782 | 782 | +a |
|
783 | 783 | a |
|
784 | 784 | c |
|
785 | 785 | x |
|
786 | 786 | record change 1/2 to 'a/a'? |
|
787 | 787 | (enter ? for help) [Ynesfdaq?] y |
|
788 | 788 | |
|
789 | 789 | @@ -1,3 +2,4 @@ |
|
790 | 790 | a |
|
791 | 791 | c |
|
792 | 792 | x |
|
793 | 793 | +x |
|
794 | 794 | record change 2/2 to 'a/a'? |
|
795 | 795 | (enter ? for help) [Ynesfdaq?] n |
|
796 | 796 | |
|
797 | 797 | shelved as test |
|
798 | 798 | merging a/a |
|
799 | 799 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
800 | 800 | $ cat a/a |
|
801 | 801 | a |
|
802 | 802 | c |
|
803 | 803 | x |
|
804 | 804 | x |
|
805 | 805 | $ cat foo/foo |
|
806 | 806 | foo |
|
807 | 807 | a |
|
808 | 808 | $ hg st |
|
809 | 809 | M a/a |
|
810 | 810 | ? foo/foo |
|
811 | 811 | $ hg bookmark |
|
812 | 812 | \* test (4|13):33f7f61e6c5e (re) |
|
813 | 813 | there shouldn't be a merge state |
|
814 | 814 | $ hg resolve -l |
|
815 | 815 | $ hg unshelve |
|
816 | 816 | unshelving change 'test' |
|
817 | 817 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
818 | 818 | rebasing shelved changes |
|
819 | 819 | merging a/a |
|
820 | 820 | $ hg bookmark |
|
821 | 821 | \* test (4|13):33f7f61e6c5e (re) |
|
822 | 822 | $ cat a/a |
|
823 | 823 | a |
|
824 | 824 | a |
|
825 | 825 | c |
|
826 | 826 | x |
|
827 | 827 | x |
|
828 | 828 | |
|
829 | 829 | shelve --patch and shelve --stat should work with valid shelfnames |
|
830 | 830 | |
|
831 | 831 | $ hg up --clean . |
|
832 | 832 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
833 | 833 | (leaving bookmark test) |
|
834 | 834 | $ hg shelve --list |
|
835 | 835 | $ echo 'patch a' > shelf-patch-a |
|
836 | 836 | $ hg add shelf-patch-a |
|
837 | 837 | $ hg shelve |
|
838 | 838 | shelved as default |
|
839 | 839 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
840 | 840 | $ echo 'patch b' > shelf-patch-b |
|
841 | 841 | $ hg add shelf-patch-b |
|
842 | 842 | $ hg shelve |
|
843 | 843 | shelved as default-01 |
|
844 | 844 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
845 | 845 | $ hg shelve --patch default default-01 |
|
846 | 846 | default-01 (*)* changes to: create conflict (glob) |
|
847 | 847 | |
|
848 | 848 | diff --git a/shelf-patch-b b/shelf-patch-b |
|
849 | 849 | new file mode 100644 |
|
850 | 850 | --- /dev/null |
|
851 | 851 | +++ b/shelf-patch-b |
|
852 | 852 | @@ -0,0 +1,1 @@ |
|
853 | 853 | +patch b |
|
854 | 854 | default (*)* changes to: create conflict (glob) |
|
855 | 855 | |
|
856 | 856 | diff --git a/shelf-patch-a b/shelf-patch-a |
|
857 | 857 | new file mode 100644 |
|
858 | 858 | --- /dev/null |
|
859 | 859 | +++ b/shelf-patch-a |
|
860 | 860 | @@ -0,0 +1,1 @@ |
|
861 | 861 | +patch a |
|
862 | 862 | $ hg shelve --stat default default-01 |
|
863 | 863 | default-01 (*)* changes to: create conflict (glob) |
|
864 | 864 | shelf-patch-b | 1 + |
|
865 | 865 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
866 | 866 | default (*)* changes to: create conflict (glob) |
|
867 | 867 | shelf-patch-a | 1 + |
|
868 | 868 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
869 | 869 | $ hg shelve --patch default |
|
870 | 870 | default (*)* changes to: create conflict (glob) |
|
871 | 871 | |
|
872 | 872 | diff --git a/shelf-patch-a b/shelf-patch-a |
|
873 | 873 | new file mode 100644 |
|
874 | 874 | --- /dev/null |
|
875 | 875 | +++ b/shelf-patch-a |
|
876 | 876 | @@ -0,0 +1,1 @@ |
|
877 | 877 | +patch a |
|
878 | 878 | $ hg shelve --stat default |
|
879 | 879 | default (*)* changes to: create conflict (glob) |
|
880 | 880 | shelf-patch-a | 1 + |
|
881 | 881 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
882 | 882 | $ hg shelve --patch nonexistentshelf |
|
883 | 883 | abort: cannot find shelf nonexistentshelf |
|
884 | 884 | [255] |
|
885 | 885 | $ hg shelve --stat nonexistentshelf |
|
886 | 886 | abort: cannot find shelf nonexistentshelf |
|
887 | 887 | [255] |
|
888 | 888 | $ hg shelve --patch default nonexistentshelf |
|
889 | 889 | abort: cannot find shelf nonexistentshelf |
|
890 | 890 | [255] |
|
891 | 891 | |
|
892 | 892 | when the user asks for a patch, we assume they want the most recent shelve if |
|
893 | 893 | they don't provide a shelve name |
|
894 | 894 | |
|
895 | 895 | $ hg shelve --patch |
|
896 | 896 | default-01 (*)* changes to: create conflict (glob) |
|
897 | 897 | |
|
898 | 898 | diff --git a/shelf-patch-b b/shelf-patch-b |
|
899 | 899 | new file mode 100644 |
|
900 | 900 | --- /dev/null |
|
901 | 901 | +++ b/shelf-patch-b |
|
902 | 902 | @@ -0,0 +1,1 @@ |
|
903 | 903 | +patch b |
|
904 | 904 | |
|
905 | 905 | $ cd .. |
|
906 | 906 | |
|
907 | 907 | Shelve from general delta repo uses bundle2 on disk |
|
908 | 908 | -------------------------------------------------- |
|
909 | 909 | |
|
910 | 910 | no general delta |
|
911 | 911 | |
|
912 | 912 | $ hg clone --pull repo bundle1 --config format.usegeneraldelta=0 |
|
913 | 913 | requesting all changes |
|
914 | 914 | adding changesets |
|
915 | 915 | adding manifests |
|
916 | 916 | adding file changes |
|
917 | 917 | added 5 changesets with 8 changes to 6 files |
|
918 | 918 | new changesets cc01e2b0c59f:33f7f61e6c5e |
|
919 | 919 | updating to branch default |
|
920 | 920 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
921 | 921 | $ cd bundle1 |
|
922 | 922 | $ echo babar > jungle |
|
923 | 923 | $ hg add jungle |
|
924 | 924 | $ hg shelve |
|
925 | 925 | shelved as default |
|
926 | 926 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
927 | 927 | $ hg debugbundle .hg/shelved/*.hg |
|
928 | 928 | 330882a04d2ce8487636b1fb292e5beea77fa1e3 |
|
929 | 929 | $ cd .. |
|
930 | 930 | |
|
931 | 931 | with general delta |
|
932 | 932 | |
|
933 | 933 | $ hg clone --pull repo bundle2 --config format.usegeneraldelta=1 |
|
934 | 934 | requesting all changes |
|
935 | 935 | adding changesets |
|
936 | 936 | adding manifests |
|
937 | 937 | adding file changes |
|
938 | 938 | added 5 changesets with 8 changes to 6 files |
|
939 | 939 | new changesets cc01e2b0c59f:33f7f61e6c5e |
|
940 | 940 | updating to branch default |
|
941 | 941 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
942 | 942 | $ cd bundle2 |
|
943 | 943 | $ echo babar > jungle |
|
944 | 944 | $ hg add jungle |
|
945 | 945 | $ hg shelve |
|
946 | 946 | shelved as default |
|
947 | 947 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
948 | 948 | $ hg debugbundle .hg/shelved/*.hg |
|
949 | 949 | Stream params: {Compression: BZ} |
|
950 | 950 | changegroup -- {nbchanges: 1, version: 02} (mandatory: True) |
|
951 | 951 | 330882a04d2ce8487636b1fb292e5beea77fa1e3 |
|
952 | 952 | |
|
953 | 953 | Test shelve --keep |
|
954 | 954 | |
|
955 | 955 | $ hg unshelve |
|
956 | 956 | unshelving change 'default' |
|
957 | 957 | $ hg shelve --keep --list |
|
958 | 958 | abort: options '--list' and '--keep' may not be used together |
|
959 | 959 | [10] |
|
960 | 960 | $ hg shelve --keep --patch |
|
961 | 961 | abort: options '--patch' and '--keep' may not be used together |
|
962 | 962 | [10] |
|
963 | 963 | $ hg shelve --keep --delete |
|
964 | 964 | abort: options '--delete' and '--keep' may not be used together |
|
965 | 965 | [10] |
|
966 | 966 | $ hg shelve --keep |
|
967 | 967 | shelved as default |
|
968 | 968 | $ hg diff |
|
969 | 969 | diff --git a/jungle b/jungle |
|
970 | 970 | new file mode 100644 |
|
971 | 971 | --- /dev/null |
|
972 | 972 | +++ b/jungle |
|
973 | 973 | @@ -0,0 +1,1 @@ |
|
974 | 974 | +babar |
|
975 | 975 | |
|
976 | 976 | Test shelve --delete |
|
977 | 977 | |
|
978 | 978 | $ hg shelve --list |
|
979 | 979 | default (*s ago) changes to: create conflict (glob) |
|
980 | 980 | $ hg shelve --delete doesnotexist |
|
981 | 981 | abort: shelved change 'doesnotexist' not found |
|
982 | 982 | [255] |
|
983 | 983 | $ hg shelve --delete default |
|
984 | 984 | |
|
985 | 985 | $ cd .. |
|
986 | 986 | |
|
987 | 987 | Test visibility of in-memory changes inside transaction to external hook |
|
988 | 988 | ------------------------------------------------------------------------ |
|
989 | 989 | |
|
990 | 990 | $ cd repo |
|
991 | 991 | |
|
992 | 992 | $ echo xxxx >> x |
|
993 | 993 | $ hg commit -m "#5: changes to invoke rebase" |
|
994 | 994 | |
|
995 | 995 | $ cat > $TESTTMP/checkvisibility.sh <<EOF |
|
996 | 996 | > echo "==== \$1:" |
|
997 | 997 | > hg parents --template "VISIBLE {rev}:{node|short}\n" |
|
998 | 998 | > # test that pending changes are hidden |
|
999 | 999 | > unset HG_PENDING |
|
1000 | 1000 | > hg parents --template "ACTUAL {rev}:{node|short}\n" |
|
1001 | 1001 | > echo "====" |
|
1002 | 1002 | > EOF |
|
1003 | 1003 | |
|
1004 | 1004 | $ cat >> .hg/hgrc <<EOF |
|
1005 | 1005 | > [defaults] |
|
1006 | 1006 | > # to fix hash id of temporary revisions |
|
1007 | 1007 | > unshelve = --date '0 0' |
|
1008 | 1008 | > EOF |
|
1009 | 1009 | |
|
1010 | 1010 | "hg unshelve" at REV5 implies steps below: |
|
1011 | 1011 | |
|
1012 | 1012 | (1) commit changes in the working directory (REV6) |
|
1013 | 1013 | (2) unbundle shelved revision (REV7) |
|
1014 | 1014 | (3) rebase: merge REV7 into REV6 (REV6 => REV6, REV7) |
|
1015 | 1015 | (4) rebase: commit merged revision (REV8) |
|
1016 | 1016 | (5) rebase: update to REV6 (REV8 => REV6) |
|
1017 | 1017 | (6) update to REV5 (REV6 => REV5) |
|
1018 | 1018 | (7) abort transaction |
|
1019 | 1019 | |
|
1020 | 1020 | == test visibility to external preupdate hook |
|
1021 | 1021 | |
|
1022 | 1022 | $ cat >> .hg/hgrc <<EOF |
|
1023 | 1023 | > [hooks] |
|
1024 | 1024 | > preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate |
|
1025 | 1025 | > EOF |
|
1026 | 1026 | |
|
1027 | 1027 | $ echo nnnn >> n |
|
1028 | 1028 | |
|
1029 | 1029 | $ sh $TESTTMP/checkvisibility.sh before-unshelving |
|
1030 | 1030 | ==== before-unshelving: |
|
1031 | 1031 | VISIBLE (5|19):703117a2acfb (re) |
|
1032 | 1032 | ACTUAL (5|19):703117a2acfb (re) |
|
1033 | 1033 | ==== |
|
1034 | 1034 | |
|
1035 | 1035 | $ hg unshelve --keep default |
|
1036 | 1036 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
1037 | 1037 | rebasing shelved changes |
|
1038 | 1038 | ==== preupdate: |
|
1039 | 1039 | VISIBLE (6|20):54c00d20fb3f (re) |
|
1040 | 1040 | ACTUAL (5|19):703117a2acfb (re) |
|
1041 | 1041 | ==== |
|
1042 | 1042 | ==== preupdate: |
|
1043 | 1043 | VISIBLE (8|21):8efe6f7537dc (re) |
|
1044 | 1044 | ACTUAL (5|19):703117a2acfb (re) |
|
1045 | 1045 | ==== |
|
1046 | 1046 | ==== preupdate: |
|
1047 | 1047 | VISIBLE (6|20):54c00d20fb3f (re) |
|
1048 | 1048 | ACTUAL (5|19):703117a2acfb (re) |
|
1049 | 1049 | ==== |
|
1050 | 1050 | |
|
1051 | 1051 | $ cat >> .hg/hgrc <<EOF |
|
1052 | 1052 | > [hooks] |
|
1053 | 1053 | > preupdate.visibility = |
|
1054 | 1054 | > EOF |
|
1055 | 1055 | |
|
1056 | 1056 | $ sh $TESTTMP/checkvisibility.sh after-unshelving |
|
1057 | 1057 | ==== after-unshelving: |
|
1058 | 1058 | VISIBLE (5|19):703117a2acfb (re) |
|
1059 | 1059 | ACTUAL (5|19):703117a2acfb (re) |
|
1060 | 1060 | ==== |
|
1061 | 1061 | |
|
1062 | 1062 | == test visibility to external update hook |
|
1063 | 1063 | |
|
1064 | 1064 | $ hg update -q -C 703117a2acfb |
|
1065 | 1065 | |
|
1066 | 1066 | $ cat >> .hg/hgrc <<EOF |
|
1067 | 1067 | > [hooks] |
|
1068 | 1068 | > update.visibility = sh $TESTTMP/checkvisibility.sh update |
|
1069 | 1069 | > EOF |
|
1070 | 1070 | |
|
1071 | 1071 | $ echo nnnn >> n |
|
1072 | 1072 | |
|
1073 | 1073 | $ sh $TESTTMP/checkvisibility.sh before-unshelving |
|
1074 | 1074 | ==== before-unshelving: |
|
1075 | 1075 | VISIBLE (5|19):703117a2acfb (re) |
|
1076 | 1076 | ACTUAL (5|19):703117a2acfb (re) |
|
1077 | 1077 | ==== |
|
1078 | 1078 | |
|
1079 | 1079 | $ hg unshelve --keep default |
|
1080 | 1080 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
1081 | 1081 | rebasing shelved changes |
|
1082 | 1082 | ==== update: |
|
1083 | 1083 | VISIBLE (6|20):54c00d20fb3f (re) |
|
1084 | 1084 | VISIBLE 1?7:492ed9d705e5 (re) |
|
1085 | 1085 | ACTUAL (5|19):703117a2acfb (re) |
|
1086 | 1086 | ==== |
|
1087 | 1087 | ==== update: |
|
1088 | 1088 | VISIBLE (6|20):54c00d20fb3f (re) |
|
1089 | 1089 | ACTUAL (5|19):703117a2acfb (re) |
|
1090 | 1090 | ==== |
|
1091 | 1091 | ==== update: |
|
1092 | 1092 | VISIBLE (5|19):703117a2acfb (re) |
|
1093 | 1093 | ACTUAL (5|19):703117a2acfb (re) |
|
1094 | 1094 | ==== |
|
1095 | 1095 | |
|
1096 | 1096 | $ cat >> .hg/hgrc <<EOF |
|
1097 | 1097 | > [hooks] |
|
1098 | 1098 | > update.visibility = |
|
1099 | 1099 | > EOF |
|
1100 | 1100 | |
|
1101 | 1101 | $ sh $TESTTMP/checkvisibility.sh after-unshelving |
|
1102 | 1102 | ==== after-unshelving: |
|
1103 | 1103 | VISIBLE (5|19):703117a2acfb (re) |
|
1104 | 1104 | ACTUAL (5|19):703117a2acfb (re) |
|
1105 | 1105 | ==== |
|
1106 | 1106 | |
|
1107 | 1107 | $ cd .. |
|
1108 | 1108 | |
|
1109 | 1109 | Keep active bookmark while (un)shelving even on shared repo (issue4940) |
|
1110 | 1110 | ----------------------------------------------------------------------- |
|
1111 | 1111 | |
|
1112 | 1112 | $ cat <<EOF >> $HGRCPATH |
|
1113 | 1113 | > [extensions] |
|
1114 | 1114 | > share = |
|
1115 | 1115 | > EOF |
|
1116 | 1116 | |
|
1117 | 1117 | $ hg bookmarks -R repo |
|
1118 | 1118 | test (4|13):33f7f61e6c5e (re) |
|
1119 | 1119 | $ hg share -B repo share |
|
1120 | 1120 | updating working directory |
|
1121 | 1121 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1122 | 1122 | $ cd share |
|
1123 | 1123 | |
|
1124 | 1124 | $ hg bookmarks |
|
1125 | 1125 | test (4|13):33f7f61e6c5e (re) |
|
1126 | 1126 | $ hg bookmarks foo |
|
1127 | 1127 | $ hg bookmarks |
|
1128 | 1128 | \* foo (5|19):703117a2acfb (re) |
|
1129 | 1129 | test (4|13):33f7f61e6c5e (re) |
|
1130 | 1130 | $ echo x >> x |
|
1131 | 1131 | $ hg shelve |
|
1132 | 1132 | shelved as foo |
|
1133 | 1133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1134 | 1134 | $ hg bookmarks |
|
1135 | 1135 | \* foo (5|19):703117a2acfb (re) |
|
1136 | 1136 | test (4|13):33f7f61e6c5e (re) |
|
1137 | 1137 | |
|
1138 | 1138 | $ hg unshelve |
|
1139 | 1139 | unshelving change 'foo' |
|
1140 | 1140 | $ hg bookmarks |
|
1141 | 1141 | \* foo (5|19):703117a2acfb (re) |
|
1142 | 1142 | test (4|13):33f7f61e6c5e (re) |
|
1143 | 1143 | |
|
1144 | 1144 | $ cd .. |
|
1145 | 1145 | |
|
1146 | 1146 | Abort unshelve while merging (issue5123) |
|
1147 | 1147 | ---------------------------------------- |
|
1148 | 1148 | |
|
1149 | 1149 | $ hg init issue5123 |
|
1150 | 1150 | $ cd issue5123 |
|
1151 | 1151 | $ echo > a |
|
1152 | 1152 | $ hg ci -Am a |
|
1153 | 1153 | adding a |
|
1154 | 1154 | $ hg co null |
|
1155 | 1155 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1156 | 1156 | $ echo > b |
|
1157 | 1157 | $ hg ci -Am b |
|
1158 | 1158 | adding b |
|
1159 | 1159 | created new head |
|
1160 | 1160 | $ echo > c |
|
1161 | 1161 | $ hg add c |
|
1162 | 1162 | $ hg shelve |
|
1163 | 1163 | shelved as default |
|
1164 | 1164 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1165 | 1165 | $ hg co 1 |
|
1166 | 1166 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1167 | 1167 | $ hg merge 0 |
|
1168 | 1168 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1169 | 1169 | (branch merge, don't forget to commit) |
|
1170 | 1170 | -- successful merge with two parents |
|
1171 | 1171 | $ hg log -G |
|
1172 | 1172 | @ changeset: 1:406bf70c274f |
|
1173 | 1173 | tag: tip |
|
1174 | 1174 | parent: -1:000000000000 |
|
1175 | 1175 | user: test |
|
1176 | 1176 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1177 | 1177 | summary: b |
|
1178 | 1178 | |
|
1179 | 1179 | @ changeset: 0:ada8c9eb8252 |
|
1180 | 1180 | user: test |
|
1181 | 1181 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1182 | 1182 | summary: a |
|
1183 | 1183 | |
|
1184 | 1184 | -- trying to pull in the shelve bits |
|
1185 | 1185 | -- unshelve should abort otherwise, it'll eat my second parent. |
|
1186 | 1186 | $ hg unshelve |
|
1187 | 1187 | abort: outstanding uncommitted merge |
|
1188 | 1188 | (use 'hg commit' or 'hg merge --abort') |
|
1189 | 1189 | [20] |
|
1190 | 1190 | |
|
1191 | 1191 | $ cd .. |
|
1192 | 1192 | |
|
1193 | 1193 | -- test for interactive mode on unshelve |
|
1194 | 1194 | |
|
1195 | 1195 | $ hg init a |
|
1196 | 1196 | $ cd a |
|
1197 | 1197 | $ echo > b |
|
1198 | 1198 | $ hg ci -Am b |
|
1199 | 1199 | adding b |
|
1200 | 1200 | $ echo > c |
|
1201 | 1201 | $ echo > d |
|
1202 | 1202 | $ hg add . |
|
1203 | 1203 | adding c |
|
1204 | 1204 | adding d |
|
1205 | 1205 | $ hg shelve |
|
1206 | 1206 | shelved as default |
|
1207 | 1207 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1208 | 1208 | $ echo > e |
|
1209 | 1209 | $ hg add e |
|
1210 | 1210 | $ hg ci -m e |
|
1211 | 1211 | $ hg shelve --patch |
|
1212 | 1212 | default (*s ago) changes to: b (glob) |
|
1213 | 1213 | |
|
1214 | 1214 | diff --git a/c b/c |
|
1215 | 1215 | new file mode 100644 |
|
1216 | 1216 | --- /dev/null |
|
1217 | 1217 | +++ b/c |
|
1218 | 1218 | @@ -0,0 +1,1 @@ |
|
1219 | 1219 | + |
|
1220 | 1220 | diff --git a/d b/d |
|
1221 | 1221 | new file mode 100644 |
|
1222 | 1222 | --- /dev/null |
|
1223 | 1223 | +++ b/d |
|
1224 | 1224 | @@ -0,0 +1,1 @@ |
|
1225 | 1225 | + |
|
1226 | 1226 | $ hg unshelve -i <<EOF |
|
1227 | 1227 | > y |
|
1228 | 1228 | > y |
|
1229 | 1229 | > y |
|
1230 | 1230 | > n |
|
1231 | 1231 | > EOF |
|
1232 | 1232 | unshelving change 'default' |
|
1233 | 1233 | rebasing shelved changes |
|
1234 | 1234 | diff --git a/c b/c |
|
1235 | 1235 | new file mode 100644 |
|
1236 | 1236 | examine changes to 'c'? |
|
1237 | 1237 | (enter ? for help) [Ynesfdaq?] y |
|
1238 | 1238 | |
|
1239 | 1239 | @@ -0,0 +1,1 @@ |
|
1240 | 1240 | + |
|
1241 | 1241 | record change 1/2 to 'c'? |
|
1242 | 1242 | (enter ? for help) [Ynesfdaq?] y |
|
1243 | 1243 | |
|
1244 | 1244 | diff --git a/d b/d |
|
1245 | 1245 | new file mode 100644 |
|
1246 | 1246 | examine changes to 'd'? |
|
1247 | 1247 | (enter ? for help) [Ynesfdaq?] y |
|
1248 | 1248 | |
|
1249 | 1249 | @@ -0,0 +1,1 @@ |
|
1250 | 1250 | + |
|
1251 | 1251 | record change 2/2 to 'd'? |
|
1252 | 1252 | (enter ? for help) [Ynesfdaq?] n |
|
1253 | 1253 | |
|
1254 | 1254 | $ ls -A |
|
1255 | 1255 | .hg |
|
1256 | 1256 | b |
|
1257 | 1257 | c |
|
1258 | 1258 | e |
|
1259 | 1259 | -- shelve should not contain `c` now |
|
1260 | 1260 | $ hg shelve --patch |
|
1261 | 1261 | default (*s ago) changes to: b (glob) |
|
1262 | 1262 | |
|
1263 | 1263 | diff --git a/d b/d |
|
1264 | 1264 | new file mode 100644 |
|
1265 | 1265 | --- /dev/null |
|
1266 | 1266 | +++ b/d |
|
1267 | 1267 | @@ -0,0 +1,1 @@ |
|
1268 | 1268 | + |
|
1269 | 1269 | $ hg unshelve -i <<EOF |
|
1270 | 1270 | > y |
|
1271 | 1271 | > y |
|
1272 | 1272 | > EOF |
|
1273 | 1273 | unshelving change 'default' |
|
1274 | 1274 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
1275 | 1275 | rebasing shelved changes |
|
1276 | 1276 | diff --git a/d b/d |
|
1277 | 1277 | new file mode 100644 |
|
1278 | 1278 | examine changes to 'd'? |
|
1279 | 1279 | (enter ? for help) [Ynesfdaq?] y |
|
1280 | 1280 | |
|
1281 | 1281 | @@ -0,0 +1,1 @@ |
|
1282 | 1282 | + |
|
1283 | 1283 | record this change to 'd'? |
|
1284 | 1284 | (enter ? for help) [Ynesfdaq?] y |
|
1285 | 1285 | |
|
1286 | 1286 | |
|
1287 | 1287 | $ hg status -v |
|
1288 | 1288 | A c |
|
1289 | 1289 | A d |
|
1290 | 1290 | $ ls -A |
|
1291 | 1291 | .hg |
|
1292 | 1292 | b |
|
1293 | 1293 | c |
|
1294 | 1294 | d |
|
1295 | 1295 | e |
|
1296 | 1296 | $ hg shelve --list |
|
1297 | 1297 | |
|
1298 | 1298 | -- now, unshelve selected changes from a file |
|
1299 | 1299 | |
|
1300 | 1300 | $ echo B > foo |
|
1301 | 1301 | $ hg add foo |
|
1302 | 1302 | $ hg ci -m 'add B to foo' |
|
1303 | 1303 | $ cat > foo <<EOF |
|
1304 | 1304 | > A |
|
1305 | 1305 | > B |
|
1306 | 1306 | > C |
|
1307 | 1307 | > EOF |
|
1308 | 1308 | $ echo > garbage |
|
1309 | 1309 | $ hg st |
|
1310 | 1310 | M foo |
|
1311 | 1311 | ? garbage |
|
1312 | 1312 | $ hg shelve --unknown |
|
1313 | 1313 | shelved as default |
|
1314 | 1314 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1315 | 1315 | $ cat foo |
|
1316 | 1316 | B |
|
1317 | 1317 | $ hg unshelve -i <<EOF |
|
1318 | 1318 | > y |
|
1319 | 1319 | > y |
|
1320 | 1320 | > n |
|
1321 | 1321 | > y |
|
1322 | 1322 | > y |
|
1323 | 1323 | > EOF |
|
1324 | 1324 | unshelving change 'default' |
|
1325 | 1325 | rebasing shelved changes |
|
1326 | 1326 | diff --git a/foo b/foo |
|
1327 | 1327 | 2 hunks, 2 lines changed |
|
1328 | 1328 | examine changes to 'foo'? |
|
1329 | 1329 | (enter ? for help) [Ynesfdaq?] y |
|
1330 | 1330 | |
|
1331 | 1331 | @@ -1,1 +1,2 @@ |
|
1332 | 1332 | +A |
|
1333 | 1333 | B |
|
1334 | 1334 | record change 1/3 to 'foo'? |
|
1335 | 1335 | (enter ? for help) [Ynesfdaq?] y |
|
1336 | 1336 | |
|
1337 | 1337 | @@ -1,1 +2,2 @@ |
|
1338 | 1338 | B |
|
1339 | 1339 | +C |
|
1340 | 1340 | record change 2/3 to 'foo'? |
|
1341 | 1341 | (enter ? for help) [Ynesfdaq?] n |
|
1342 | 1342 | |
|
1343 | 1343 | diff --git a/garbage b/garbage |
|
1344 | 1344 | new file mode 100644 |
|
1345 | 1345 | examine changes to 'garbage'? |
|
1346 | 1346 | (enter ? for help) [Ynesfdaq?] y |
|
1347 | 1347 | |
|
1348 | 1348 | @@ -0,0 +1,1 @@ |
|
1349 | 1349 | + |
|
1350 | 1350 | record change 3/3 to 'garbage'? |
|
1351 | 1351 | (enter ? for help) [Ynesfdaq?] y |
|
1352 | 1352 | |
|
1353 | 1353 | $ hg st |
|
1354 | 1354 | M foo |
|
1355 | 1355 | ? garbage |
|
1356 | 1356 | $ cat foo |
|
1357 | 1357 | A |
|
1358 | 1358 | B |
|
1359 | 1359 | $ hg shelve --patch |
|
1360 | 1360 | default (*s ago) changes to: add B to foo (glob) |
|
1361 | 1361 | |
|
1362 | 1362 | diff --git a/foo b/foo |
|
1363 | 1363 | --- a/foo |
|
1364 | 1364 | +++ b/foo |
|
1365 | 1365 | @@ -1,2 +1,3 @@ |
|
1366 | 1366 | A |
|
1367 | 1367 | B |
|
1368 | 1368 | +C |
|
1369 | 1369 | |
|
1370 | 1370 | -- unshelve interactive on conflicts |
|
1371 | 1371 | |
|
1372 | 1372 | $ echo A >> bar1 |
|
1373 | 1373 | $ echo A >> bar2 |
|
1374 | 1374 | $ hg add bar1 bar2 |
|
1375 | 1375 | $ hg ci -m 'add A to bars' |
|
1376 | 1376 | $ echo B >> bar1 |
|
1377 | 1377 | $ echo B >> bar2 |
|
1378 | 1378 | $ hg shelve |
|
1379 | 1379 | shelved as default-01 |
|
1380 | 1380 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1381 | 1381 | $ echo C >> bar1 |
|
1382 | 1382 | $ echo C >> bar2 |
|
1383 | 1383 | $ hg ci -m 'add C to bars' |
|
1384 | 1384 | $ hg unshelve -i |
|
1385 | 1385 | unshelving change 'default-01' |
|
1386 | 1386 | rebasing shelved changes |
|
1387 | 1387 | merging bar1 |
|
1388 | 1388 | merging bar2 |
|
1389 | 1389 | warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark') |
|
1390 | 1390 | warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark') |
|
1391 | 1391 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
|
1392 | 1392 | [240] |
|
1393 | 1393 | |
|
1394 | 1394 | $ cat > bar1 <<EOF |
|
1395 | 1395 | > A |
|
1396 | 1396 | > B |
|
1397 | 1397 | > C |
|
1398 | 1398 | > EOF |
|
1399 | 1399 | $ cat > bar2 <<EOF |
|
1400 | 1400 | > A |
|
1401 | 1401 | > B |
|
1402 | 1402 | > C |
|
1403 | 1403 | > EOF |
|
1404 | 1404 | $ hg resolve -m bar1 bar2 |
|
1405 | 1405 | (no more unresolved files) |
|
1406 | 1406 | continue: hg unshelve --continue |
|
1407 | 1407 | |
|
1408 | 1408 | -- using --continue with --interactive should throw an error |
|
1409 | 1409 | $ hg unshelve --continue -i |
|
1410 | 1410 | abort: cannot use both continue and interactive |
|
1411 | 1411 | [255] |
|
1412 | 1412 | |
|
1413 | 1413 | $ cat bar1 |
|
1414 | 1414 | A |
|
1415 | 1415 | B |
|
1416 | 1416 | C |
|
1417 | 1417 | |
|
1418 | 1418 | #if stripbased |
|
1419 | 1419 | $ hg log -r 3:: -G |
|
1420 | 1420 | @ changeset: 5:f1d5f53e397b |
|
1421 | 1421 | | tag: tip |
|
1422 | 1422 | | parent: 3:e28fd7fa7938 |
|
1423 | 1423 | | user: shelve@localhost |
|
1424 | 1424 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1425 | 1425 | | summary: changes to: add A to bars |
|
1426 | 1426 | | |
|
1427 | 1427 | | @ changeset: 4:fe451a778c81 |
|
1428 | 1428 | |/ user: test |
|
1429 | 1429 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1430 | 1430 | | summary: add C to bars |
|
1431 | 1431 | | |
|
1432 | 1432 | o changeset: 3:e28fd7fa7938 |
|
1433 | 1433 | | user: test |
|
1434 | 1434 | ~ date: Thu Jan 01 00:00:00 1970 +0000 |
|
1435 | 1435 | summary: add A to bars |
|
1436 | 1436 | |
|
1437 | 1437 | #endif |
|
1438 | 1438 | |
|
1439 | 1439 | $ hg unshelve --continue <<EOF |
|
1440 | 1440 | > y |
|
1441 | 1441 | > y |
|
1442 | 1442 | > y |
|
1443 | 1443 | > n |
|
1444 | 1444 | > EOF |
|
1445 | 1445 | diff --git a/bar1 b/bar1 |
|
1446 | 1446 | 1 hunks, 1 lines changed |
|
1447 | 1447 | examine changes to 'bar1'? |
|
1448 | 1448 | (enter ? for help) [Ynesfdaq?] y |
|
1449 | 1449 | |
|
1450 | 1450 | @@ -1,2 +1,3 @@ |
|
1451 | 1451 | A |
|
1452 | 1452 | +B |
|
1453 | 1453 | C |
|
1454 | 1454 | record change 1/2 to 'bar1'? |
|
1455 | 1455 | (enter ? for help) [Ynesfdaq?] y |
|
1456 | 1456 | |
|
1457 | 1457 | diff --git a/bar2 b/bar2 |
|
1458 | 1458 | 1 hunks, 1 lines changed |
|
1459 | 1459 | examine changes to 'bar2'? |
|
1460 | 1460 | (enter ? for help) [Ynesfdaq?] y |
|
1461 | 1461 | |
|
1462 | 1462 | @@ -1,2 +1,3 @@ |
|
1463 | 1463 | A |
|
1464 | 1464 | +B |
|
1465 | 1465 | C |
|
1466 | 1466 | record change 2/2 to 'bar2'? |
|
1467 | 1467 | (enter ? for help) [Ynesfdaq?] n |
|
1468 | 1468 | |
|
1469 | 1469 | unshelve of 'default-01' complete |
|
1470 | 1470 | |
|
1471 | 1471 | #if stripbased |
|
1472 | 1472 | $ hg log -r 3:: -G |
|
1473 | 1473 | @ changeset: 4:fe451a778c81 |
|
1474 | 1474 | | tag: tip |
|
1475 | 1475 | | user: test |
|
1476 | 1476 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1477 | 1477 | | summary: add C to bars |
|
1478 | 1478 | | |
|
1479 | 1479 | o changeset: 3:e28fd7fa7938 |
|
1480 | 1480 | | user: test |
|
1481 | 1481 | ~ date: Thu Jan 01 00:00:00 1970 +0000 |
|
1482 | 1482 | summary: add A to bars |
|
1483 | 1483 | |
|
1484 | 1484 | #endif |
|
1485 | 1485 | |
|
1486 | 1486 | $ hg unshelve --continue |
|
1487 | 1487 | abort: no unshelve in progress |
|
1488 | 1488 | [20] |
|
1489 | 1489 | |
|
1490 | 1490 | $ hg shelve --list |
|
1491 | 1491 | default-01 (*)* changes to: add A to bars (glob) |
|
1492 | 1492 | default (*)* changes to: add B to foo (glob) |
|
1493 | 1493 | $ hg unshelve -n default-01 -i <<EOF |
|
1494 | 1494 | > y |
|
1495 | 1495 | > y |
|
1496 | 1496 | > EOF |
|
1497 | 1497 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
1498 | 1498 | rebasing shelved changes |
|
1499 | 1499 | diff --git a/bar2 b/bar2 |
|
1500 | 1500 | 1 hunks, 1 lines changed |
|
1501 | 1501 | examine changes to 'bar2'? |
|
1502 | 1502 | (enter ? for help) [Ynesfdaq?] y |
|
1503 | 1503 | |
|
1504 | 1504 | @@ -1,2 +1,3 @@ |
|
1505 | 1505 | A |
|
1506 | 1506 | +B |
|
1507 | 1507 | C |
|
1508 | 1508 | record this change to 'bar2'? |
|
1509 | 1509 | (enter ? for help) [Ynesfdaq?] y |
|
1510 | 1510 | |
|
1511 | 1511 | -- test for --interactive --keep |
|
1512 | 1512 | $ hg unshelve -i --keep |
|
1513 | 1513 | abort: --keep on --interactive is not yet supported |
|
1514 | 1514 | [255] |
|
1515 | ||
|
1516 | $ hg update -q --clean . | |
|
1517 | ||
|
1518 | Test that we can successfully shelve and unshelve a file with a trailing space | |
|
1519 | in the filename. Such filenames are supposedly unsupported on Windows, so we | |
|
1520 | wrap it in the no-windows check. Also test `hg patch` of the .patch file | |
|
1521 | produced by `hg shelve`. | |
|
1522 | #if no-windows | |
|
1523 | $ echo hi > 'my filename ' | |
|
1524 | $ hg add 'my filename ' | |
|
1525 | warning: filename ends with ' ', which is not allowed on Windows: 'my filename ' | |
|
1526 | $ hg shelve | |
|
1527 | shelved as default-01 | |
|
1528 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
1529 | $ cp .hg/shelved/default-01.patch test_patch.patch | |
|
1530 | $ hg unshelve | |
|
1531 | unshelving change 'default-01' | |
|
1532 | $ cat 'my filename ' | |
|
1533 | hi | |
|
1534 | $ hg update -q --clean . | |
|
1535 | $ hg patch -p1 test_patch.patch | |
|
1536 | applying test_patch.patch | |
|
1537 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now