Mercurial > hg
annotate mercurial/patch.py @ 37611:ae8730877371
httppeer: basic implementation of capabilities interface
This is a bit crude. The capabilities mechanism for version 2 of
the wire protocol is a bit different from version 1. And code
in core is relying on strings passed to capable() matching strings
advertised by the "capabilities" wire protocol command. I may
refactor the internal checking mechanism to be a bit more
abstract or based on interfaces. Time will tell...
Differential Revision: https://phab.mercurial-scm.org/D3256
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 10 Apr 2018 19:09:35 -0700 |
parents | a1bcc7ff0eac |
children | 5537d8f5e989 |
rev | line source |
---|---|
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1 # patch.py - patch file parsing routines |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
2 # |
2865
71e78f2ca5ae
merge git patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2863
diff
changeset
|
3 # Copyright 2006 Brendan Cully <brendan@kublai.com> |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
4 # Copyright 2007 Chris Mason <chris.mason@oracle.com> |
2865
71e78f2ca5ae
merge git patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2863
diff
changeset
|
5 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
6 # This software may be used and distributed according to the terms of the |
10263 | 7 # GNU General Public License version 2 or any later version. |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
8 |
34137
a8994d08e4a2
doctest: use print_function and convert bytes to unicode where needed
Yuya Nishihara <yuya@tcha.org>
parents:
34131
diff
changeset
|
9 from __future__ import absolute_import, print_function |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
10 |
25113
0ca8410ea345
util: drop alias for collections.deque
Martin von Zweigbergk <martinvonz@google.com>
parents:
24845
diff
changeset
|
11 import collections |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
12 import copy |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
13 import difflib |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
14 import email |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
15 import errno |
29341
0d83ad967bf8
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
Augie Fackler <raf@durin42.com>
parents:
29326
diff
changeset
|
16 import hashlib |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
17 import os |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
18 import posixpath |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
19 import re |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
20 import shutil |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
21 import tempfile |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
22 import zlib |
10965
7faef79a89c7
patch: move mercurial-specific imports after stdlib imports
Augie Fackler <durin42@gmail.com>
parents:
10905
diff
changeset
|
23 |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
24 from .i18n import _ |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
25 from .node import ( |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
26 hex, |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
27 short, |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
28 ) |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
29 from . import ( |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
30 copies, |
37571
0ea8b9576d7c
diffhelpers: move out of pure package
Yuya Nishihara <yuya@tcha.org>
parents:
37570
diff
changeset
|
31 diffhelpers, |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
32 encoding, |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
33 error, |
28341
8286f551b7ee
patch: when importing from email, RFC2047-decode From/Subject headers
Julien Cristau <julien.cristau@logilab.fr>
parents:
27902
diff
changeset
|
34 mail, |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
35 mdiff, |
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
36 pathutil, |
30924
48dea083f66d
py3: convert the mode argument of os.fdopen to unicodes (1 of 2)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30819
diff
changeset
|
37 pycompat, |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
38 scmutil, |
30807
6381a6dbc325
patch: use opt.showsimilarity to calculate and show the similarity
Sean Farley <sean@farley.io>
parents:
30806
diff
changeset
|
39 similar, |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
40 util, |
31233
067f2a95e32c
vfs: use 'vfs' module directly in 'mercurial.patch'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31216
diff
changeset
|
41 vfs as vfsmod, |
27485
60183975b5bc
patch: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27412
diff
changeset
|
42 ) |
37084
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36838
diff
changeset
|
43 from .utils import ( |
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36838
diff
changeset
|
44 dateutil, |
37120
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
37084
diff
changeset
|
45 procutil, |
37084
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36838
diff
changeset
|
46 stringutil, |
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36838
diff
changeset
|
47 ) |
32370
017ad85e5ac8
diffhelpers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents:
32320
diff
changeset
|
48 |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
49 stringio = util.stringio |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
50 |
31630
451c980a8b57
patch: make regular expressions bytes by adding b''
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31274
diff
changeset
|
51 gitre = re.compile(br'diff --git a/(.*) b/(.*)') |
451c980a8b57
patch: make regular expressions bytes by adding b''
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31274
diff
changeset
|
52 tabsplitter = re.compile(br'(\t+|[^\t]+)') |
35383
82c3762349ac
patch: do not break up multibyte character when highlighting word
Yuya Nishihara <yuya@tcha.org>
parents:
35366
diff
changeset
|
53 _nonwordre = re.compile(br'([^a-zA-Z0-9_\x80-\xff])') |
7199
dd891d0d97a3
patch: consolidate two different regexes for parsing of git diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7198
diff
changeset
|
54 |
34251
61714510220d
error: move patch.PatchError so it can easily implement __bytes__ (API)
Yuya Nishihara <yuya@tcha.org>
parents:
34137
diff
changeset
|
55 PatchError = error.PatchError |
2933
439fd013360d
Move import's working dir update code into patch.updatedir
Brendan Cully <brendan@kublai.com>
parents:
2922
diff
changeset
|
56 |
439fd013360d
Move import's working dir update code into patch.updatedir
Brendan Cully <brendan@kublai.com>
parents:
2922
diff
changeset
|
57 # public functions |
439fd013360d
Move import's working dir update code into patch.updatedir
Brendan Cully <brendan@kublai.com>
parents:
2922
diff
changeset
|
58 |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
59 def split(stream): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
60 '''return an iterator of individual patches from a stream''' |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
61 def isheader(line, inheader): |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
62 if inheader and line.startswith((' ', '\t')): |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
63 # continuation |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
64 return True |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
65 if line.startswith((' ', '-', '+')): |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10748
diff
changeset
|
66 # diff line - don't check for header pattern in there |
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10748
diff
changeset
|
67 return False |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
68 l = line.split(': ', 1) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
69 return len(l) == 2 and ' ' not in l[0] |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
70 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
71 def chunk(lines): |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
72 return stringio(''.join(lines)) |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
73 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
74 def hgsplit(stream, cur): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
75 inheader = True |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
76 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
77 for line in stream: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
78 if not line.strip(): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
79 inheader = False |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
80 if not inheader and line.startswith('# HG changeset patch'): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
81 yield chunk(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
82 cur = [] |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
83 inheader = True |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
84 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
85 cur.append(line) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
86 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
87 if cur: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
88 yield chunk(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
89 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
90 def mboxsplit(stream, cur): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
91 for line in stream: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
92 if line.startswith('From '): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
93 for c in split(chunk(cur[1:])): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
94 yield c |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
95 cur = [] |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
96 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
97 cur.append(line) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
98 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
99 if cur: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
100 for c in split(chunk(cur[1:])): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
101 yield c |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
102 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
103 def mimesplit(stream, cur): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
104 def msgfp(m): |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
105 fp = stringio() |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
106 g = email.Generator.Generator(fp, mangle_from_=False) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
107 g.flatten(m) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
108 fp.seek(0) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
109 return fp |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
110 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
111 for line in stream: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
112 cur.append(line) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
113 c = chunk(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
114 |
36045
04984f2e50ae
py3: use email parser that operates on bytes
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36035
diff
changeset
|
115 m = pycompat.emailparser().parse(c) |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
116 if not m.is_multipart(): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
117 yield msgfp(m) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
118 else: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
119 ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
120 for part in m.walk(): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
121 ct = part.get_content_type() |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
122 if ct not in ok_types: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
123 continue |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
124 yield msgfp(part) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
125 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
126 def headersplit(stream, cur): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
127 inheader = False |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
128 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
129 for line in stream: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
130 if not inheader and isheader(line, inheader): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
131 yield chunk(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
132 cur = [] |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
133 inheader = True |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
134 if inheader and not isheader(line, inheader): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
135 inheader = False |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
136 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
137 cur.append(line) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
138 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
139 if cur: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
140 yield chunk(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
141 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
142 def remainder(cur): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
143 yield chunk(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
144 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
145 class fiter(object): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
146 def __init__(self, fp): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
147 self.fp = fp |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
148 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
149 def __iter__(self): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
150 return self |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
151 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
152 def next(self): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
153 l = self.fp.readline() |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
154 if not l: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
155 raise StopIteration |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
156 return l |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
157 |
35191
a1d2fc32bb99
py3: define __next__ in patch.py
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35062
diff
changeset
|
158 __next__ = next |
a1d2fc32bb99
py3: define __next__ in patch.py
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35062
diff
changeset
|
159 |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
160 inheader = False |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
161 cur = [] |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
162 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
163 mimeheaders = ['content-type'] |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
164 |
14966
0588fb0e2e8d
patch: use safehasattr instead of hasattr
Augie Fackler <durin42@gmail.com>
parents:
14832
diff
changeset
|
165 if not util.safehasattr(stream, 'next'): |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
166 # http responses, for example, have readline but not next |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
167 stream = fiter(stream) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
168 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
169 for line in stream: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
170 cur.append(line) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
171 if line.startswith('# HG changeset patch'): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
172 return hgsplit(stream, cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
173 elif line.startswith('From '): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
174 return mboxsplit(stream, cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
175 elif isheader(line, inheader): |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
176 inheader = True |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
177 if line.split(':', 1)[0].lower() in mimeheaders: |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
178 # let email parser handle this |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
179 return mimesplit(stream, cur) |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10467
diff
changeset
|
180 elif line.startswith('--- ') and inheader: |
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10467
diff
changeset
|
181 # No evil headers seen by diff start, split by hand |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
182 return headersplit(stream, cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
183 # Not enough info, keep reading |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
184 |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
185 # if we are here, we have a very plain patch |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
186 return remainder(cur) |
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
10282
diff
changeset
|
187 |
26557
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
188 ## Some facility for extensible patch parsing: |
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
189 # list of pairs ("header to match", "data key") |
26559
dbd4392daedf
extract: parse 'branch' using the generic mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26558
diff
changeset
|
190 patchheadermap = [('Date', 'date'), |
dbd4392daedf
extract: parse 'branch' using the generic mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26558
diff
changeset
|
191 ('Branch', 'branch'), |
26560
75d448d56a9d
extract: parse 'nodeid' using the generic mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26559
diff
changeset
|
192 ('Node ID', 'nodeid'), |
26559
dbd4392daedf
extract: parse 'branch' using the generic mechanism
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26558
diff
changeset
|
193 ] |
26557
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
194 |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
195 def extract(ui, fileobj): |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
196 '''extract patch from data read from fileobj. |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
197 |
4263 | 198 patch can be a normal patch or contained in an email message. |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
199 |
26781
1aee2ab0f902
spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents:
26587
diff
changeset
|
200 return a dictionary. Standard keys are: |
26547
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
201 - filename, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
202 - message, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
203 - user, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
204 - date, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
205 - branch, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
206 - node, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
207 - p1, |
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
208 - p2. |
26781
1aee2ab0f902
spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents:
26587
diff
changeset
|
209 Any item can be missing from the dictionary. If filename is missing, |
4263 | 210 fileobj did not contain a patch. Caller must unlink filename when done.''' |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
211 |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
212 # attempt to detect the start of a patch |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
213 # (this heuristic is borrowed from quilt) |
34964
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34908
diff
changeset
|
214 diffre = re.compile(br'^(?:Index:[ \t]|diff[ \t]-|RCS file: |' |
34066
871a58b5f428
py3: fix type of regex literals in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34042
diff
changeset
|
215 br'retrieving revision [0-9]+(\.[0-9]+)*$|' |
871a58b5f428
py3: fix type of regex literals in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34042
diff
changeset
|
216 br'---[ \t].*?^\+\+\+[ \t]|' |
871a58b5f428
py3: fix type of regex literals in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34042
diff
changeset
|
217 br'\*\*\*[ \t].*?^---[ \t])', |
871a58b5f428
py3: fix type of regex literals in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34042
diff
changeset
|
218 re.MULTILINE | re.DOTALL) |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
219 |
26547
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
220 data = {} |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
221 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') |
36835
5bc7ff103081
py3: use r'' instead of sysstr('') to get around code transformer
Yuya Nishihara <yuya@tcha.org>
parents:
36676
diff
changeset
|
222 tmpfp = os.fdopen(fd, r'wb') |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
223 try: |
36045
04984f2e50ae
py3: use email parser that operates on bytes
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36035
diff
changeset
|
224 msg = pycompat.emailparser().parse(fileobj) |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
225 |
37468
ef661ce45cdb
py3: use system string to access email headers
Yuya Nishihara <yuya@tcha.org>
parents:
37463
diff
changeset
|
226 subject = msg[r'Subject'] and mail.headdecode(msg[r'Subject']) |
ef661ce45cdb
py3: use system string to access email headers
Yuya Nishihara <yuya@tcha.org>
parents:
37463
diff
changeset
|
227 data['user'] = msg[r'From'] and mail.headdecode(msg[r'From']) |
26556
2bef84fad19f
extract: remove the 'user' variable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26555
diff
changeset
|
228 if not subject and not data['user']: |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
9243
diff
changeset
|
229 # Not an email, restore parsed headers if any |
37456
19becdf565ef
py3: convert parsed message items to bytes in patch.extract()
Yuya Nishihara <yuya@tcha.org>
parents:
37120
diff
changeset
|
230 subject = '\n'.join(': '.join(map(encoding.strtolocal, h)) |
19becdf565ef
py3: convert parsed message items to bytes in patch.extract()
Yuya Nishihara <yuya@tcha.org>
parents:
37120
diff
changeset
|
231 for h in msg.items()) + '\n' |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
9243
diff
changeset
|
232 |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
233 # should try to parse msg['Date'] |
4263 | 234 parents = [] |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
235 |
4777
5ee5cbfceff3
patch.extract: do not prepend subject if the description already starts with it
Brendan Cully <brendan@kublai.com>
parents:
4659
diff
changeset
|
236 if subject: |
5ee5cbfceff3
patch.extract: do not prepend subject if the description already starts with it
Brendan Cully <brendan@kublai.com>
parents:
4659
diff
changeset
|
237 if subject.startswith('[PATCH'): |
5ee5cbfceff3
patch.extract: do not prepend subject if the description already starts with it
Brendan Cully <brendan@kublai.com>
parents:
4659
diff
changeset
|
238 pend = subject.find(']') |
4208
bd9b84b9a84b
Make [PATCH] removal slightly more robust
Brendan Cully <brendan@kublai.com>
parents:
4201
diff
changeset
|
239 if pend >= 0: |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
240 subject = subject[pend + 1:].lstrip() |
34066
871a58b5f428
py3: fix type of regex literals in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34042
diff
changeset
|
241 subject = re.sub(br'\n[ \t]+', ' ', subject) |
4777
5ee5cbfceff3
patch.extract: do not prepend subject if the description already starts with it
Brendan Cully <brendan@kublai.com>
parents:
4659
diff
changeset
|
242 ui.debug('Subject: %s\n' % subject) |
26556
2bef84fad19f
extract: remove the 'user' variable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26555
diff
changeset
|
243 if data['user']: |
2bef84fad19f
extract: remove the 'user' variable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26555
diff
changeset
|
244 ui.debug('From: %s\n' % data['user']) |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
245 diffs_seen = 0 |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
246 ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') |
4900
e56c7e05c7e6
patch.py: re-add the ability to use an external patch program
Bryan O'Sullivan <bos@serpentine.com>
parents:
4899
diff
changeset
|
247 message = '' |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
248 for part in msg.walk(): |
36035
95791b275b73
py3: convert content-type to bytes
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35951
diff
changeset
|
249 content_type = pycompat.bytestr(part.get_content_type()) |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
250 ui.debug('Content-Type: %s\n' % content_type) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
251 if content_type not in ok_types: |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
252 continue |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
253 payload = part.get_payload(decode=True) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
254 m = diffre.search(payload) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
255 if m: |
4220
1253703853a8
git-send-email compatibility: stop reading changelog after ^---$
Brendan Cully <brendan@kublai.com>
parents:
4208
diff
changeset
|
256 hgpatch = False |
12645
d7452292f9d3
import: don't strip '#' lines from patch descriptions (issue 2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12577
diff
changeset
|
257 hgpatchheader = False |
4220
1253703853a8
git-send-email compatibility: stop reading changelog after ^---$
Brendan Cully <brendan@kublai.com>
parents:
4208
diff
changeset
|
258 ignoretext = False |
1253703853a8
git-send-email compatibility: stop reading changelog after ^---$
Brendan Cully <brendan@kublai.com>
parents:
4208
diff
changeset
|
259 |
9467
4c041f1ee1b4
do not attempt to translate ui.debug output
Martin Geisler <mg@lazybytes.net>
parents:
9393
diff
changeset
|
260 ui.debug('found patch at byte %d\n' % m.start(0)) |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
261 diffs_seen += 1 |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
262 cfp = stringio() |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
263 for line in payload[:m.start(0)].splitlines(): |
12728
80a3d1121c10
import: only the first hg patch marker should be processed (issue2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12675
diff
changeset
|
264 if line.startswith('# HG changeset patch') and not hgpatch: |
9467
4c041f1ee1b4
do not attempt to translate ui.debug output
Martin Geisler <mg@lazybytes.net>
parents:
9393
diff
changeset
|
265 ui.debug('patch generated by hg export\n') |
12728
80a3d1121c10
import: only the first hg patch marker should be processed (issue2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12675
diff
changeset
|
266 hgpatch = True |
12645
d7452292f9d3
import: don't strip '#' lines from patch descriptions (issue 2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12577
diff
changeset
|
267 hgpatchheader = True |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
268 # drop earlier commit message content |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
269 cfp.seek(0) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
270 cfp.truncate() |
4778
e321f16f4eac
patch.extract: fix test-import breakage introduced in the previous changeset
Brendan Cully <brendan@kublai.com>
parents:
4777
diff
changeset
|
271 subject = None |
12645
d7452292f9d3
import: don't strip '#' lines from patch descriptions (issue 2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12577
diff
changeset
|
272 elif hgpatchheader: |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
273 if line.startswith('# User '): |
26556
2bef84fad19f
extract: remove the 'user' variable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26555
diff
changeset
|
274 data['user'] = line[7:] |
2bef84fad19f
extract: remove the 'user' variable
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26555
diff
changeset
|
275 ui.debug('From: %s\n' % data['user']) |
4263 | 276 elif line.startswith("# Parent "): |
16475
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
16358
diff
changeset
|
277 parents.append(line[9:].lstrip()) |
26557
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
278 elif line.startswith("# "): |
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
279 for header, key in patchheadermap: |
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
280 prefix = '# %s ' % header |
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
281 if line.startswith(prefix): |
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
282 data[key] = line[len(prefix):] |
23f3f1cbd53b
extract: add some facility for extensible header parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26556
diff
changeset
|
283 else: |
12645
d7452292f9d3
import: don't strip '#' lines from patch descriptions (issue 2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12577
diff
changeset
|
284 hgpatchheader = False |
19513
9e8298a324ac
import: cut commit messages at --- unconditionally (issue2148)
Matt Mackall <mpm@selenic.com>
parents:
19155
diff
changeset
|
285 elif line == '---': |
4220
1253703853a8
git-send-email compatibility: stop reading changelog after ^---$
Brendan Cully <brendan@kublai.com>
parents:
4208
diff
changeset
|
286 ignoretext = True |
12645
d7452292f9d3
import: don't strip '#' lines from patch descriptions (issue 2417)
Mads Kiilerich <mads@kiilerich.com>
parents:
12577
diff
changeset
|
287 if not hgpatchheader and not ignoretext: |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
288 cfp.write(line) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
289 cfp.write('\n') |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
290 message = cfp.getvalue() |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
291 if tmpfp: |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
292 tmpfp.write(payload) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
293 if not payload.endswith('\n'): |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
294 tmpfp.write('\n') |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
295 elif not diffs_seen and message and content_type == 'text/plain': |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
296 message += '\n' + payload |
16705
c2d9ef43ff6c
check-code: ignore naked excepts with a "re-raise" comment
Brodie Rao <brodie@sf.io>
parents:
16687
diff
changeset
|
297 except: # re-raises |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
298 tmpfp.close() |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
299 os.unlink(tmpname) |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
300 raise |
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
301 |
4777
5ee5cbfceff3
patch.extract: do not prepend subject if the description already starts with it
Brendan Cully <brendan@kublai.com>
parents:
4659
diff
changeset
|
302 if subject and not message.startswith(subject): |
5ee5cbfceff3
patch.extract: do not prepend subject if the description already starts with it
Brendan Cully <brendan@kublai.com>
parents:
4659
diff
changeset
|
303 message = '%s\n%s' % (subject, message) |
26549
1a680ccdb09a
extract: assign message only once
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26548
diff
changeset
|
304 data['message'] = message |
2866
2893e51407a4
commands.import: refactor patch parsing into patch.extract.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2865
diff
changeset
|
305 tmpfp.close() |
24306
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
306 if parents: |
26550
72782f60dbc9
extract: directly assign parent to data dictionary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26549
diff
changeset
|
307 data['p1'] = parents.pop(0) |
26548
25a58881efdd
extract: simplify parents assignement
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26547
diff
changeset
|
308 if parents: |
26550
72782f60dbc9
extract: directly assign parent to data dictionary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26549
diff
changeset
|
309 data['p2'] = parents.pop(0) |
24306
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
310 |
26555
1e33384ff2ed
extract: use a single return
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26554
diff
changeset
|
311 if diffs_seen: |
1e33384ff2ed
extract: use a single return
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26554
diff
changeset
|
312 data['filename'] = tmpname |
1e33384ff2ed
extract: use a single return
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26554
diff
changeset
|
313 else: |
1e33384ff2ed
extract: use a single return
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26554
diff
changeset
|
314 os.unlink(tmpname) |
26547
b9be8ab6e628
patch: move 'extract' return to a dictionnary
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26421
diff
changeset
|
315 return data |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
316 |
8778
c5f36402daad
use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8761
diff
changeset
|
317 class patchmeta(object): |
7148
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
318 """Patched file metadata |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
319 |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
320 'op' is the performed operation within ADD, DELETE, RENAME, MODIFY |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
321 or COPY. 'path' is patched file path. 'oldpath' is set to the |
7149
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
322 origin file when 'op' is either COPY or RENAME, None otherwise. If |
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
323 file mode is changed, 'mode' is a tuple (islink, isexec) where |
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
324 'islink' is True if the file is a symlink and 'isexec' is True if |
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
325 the file is executable. Otherwise, 'mode' is None. |
7148
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
326 """ |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
327 def __init__(self, path): |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
328 self.path = path |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
329 self.oldpath = None |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
330 self.mode = None |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
331 self.op = 'MODIFY' |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
332 self.binary = False |
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
333 |
7149
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
334 def setmode(self, mode): |
25658
e93036747902
global: mass rewrite to use modern octal syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25644
diff
changeset
|
335 islink = mode & 0o20000 |
e93036747902
global: mass rewrite to use modern octal syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25644
diff
changeset
|
336 isexec = mode & 0o100 |
7149
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
337 self.mode = (islink, isexec) |
01a056c54385
patch: patchmeta gives (islink, isexec) tuple instead of int mode
Patrick Mezard <pmezard@gmail.com>
parents:
7148
diff
changeset
|
338 |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
339 def copy(self): |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
340 other = patchmeta(self.path) |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
341 other.oldpath = self.oldpath |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
342 other.mode = self.mode |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
343 other.op = self.op |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
344 other.binary = self.binary |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
345 return other |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
346 |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
347 def _ispatchinga(self, afile): |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
348 if afile == '/dev/null': |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
349 return self.op == 'ADD' |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
350 return afile == 'a/' + (self.oldpath or self.path) |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
351 |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
352 def _ispatchingb(self, bfile): |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
353 if bfile == '/dev/null': |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
354 return self.op == 'DELETE' |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
355 return bfile == 'b/' + self.path |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
356 |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
357 def ispatching(self, afile, bfile): |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
358 return self._ispatchinga(afile) and self._ispatchingb(bfile) |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
359 |
11018
17cf756ba25d
patch: descriptive patchmeta.__repr__ to help debugging
Mads Kiilerich <mads@kiilerich.com>
parents:
10966
diff
changeset
|
360 def __repr__(self): |
17cf756ba25d
patch: descriptive patchmeta.__repr__ to help debugging
Mads Kiilerich <mads@kiilerich.com>
parents:
10966
diff
changeset
|
361 return "<patchmeta %s %r>" % (self.op, self.path) |
17cf756ba25d
patch: descriptive patchmeta.__repr__ to help debugging
Mads Kiilerich <mads@kiilerich.com>
parents:
10966
diff
changeset
|
362 |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
363 def readgitpatch(lr): |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
364 """extract git-style metadata about patches from <patchname>""" |
3223
53e843840349
Whitespace/Tab cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3199
diff
changeset
|
365 |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
366 # Filter patch for git information |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
367 gp = None |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
368 gitpatches = [] |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
369 for line in lr: |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
370 line = line.rstrip(' \r\n') |
18830
6b827d84d286
patch: match 'diff --git a/' instead of 'diff --git'
Sean Farley <sean.michael.farley@gmail.com>
parents:
18824
diff
changeset
|
371 if line.startswith('diff --git a/'): |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
372 m = gitre.match(line) |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
373 if m: |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
374 if gp: |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
375 gitpatches.append(gp) |
9392
039bce1b505f
patch: readgitpatch: remove unused variable 'src'
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9331
diff
changeset
|
376 dst = m.group(2) |
7148
7d84e5b00e29
patch: extract and rename gitpatch into patchmeta, document
Patrick Mezard <pmezard@gmail.com>
parents:
7147
diff
changeset
|
377 gp = patchmeta(dst) |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
378 elif gp: |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
379 if line.startswith('--- '): |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
380 gitpatches.append(gp) |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
381 gp = None |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
382 continue |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
383 if line.startswith('rename from '): |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
384 gp.op = 'RENAME' |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
385 gp.oldpath = line[12:] |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
386 elif line.startswith('rename to '): |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
387 gp.path = line[10:] |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
388 elif line.startswith('copy from '): |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
389 gp.op = 'COPY' |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
390 gp.oldpath = line[10:] |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
391 elif line.startswith('copy to '): |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
392 gp.path = line[8:] |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
393 elif line.startswith('deleted file'): |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
394 gp.op = 'DELETE' |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
395 elif line.startswith('new file mode '): |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
396 gp.op = 'ADD' |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
397 gp.setmode(int(line[-6:], 8)) |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
398 elif line.startswith('new mode '): |
9243
df21a009c9c4
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bill Barry <after.fallout@gmail.com>
parents:
9123
diff
changeset
|
399 gp.setmode(int(line[-6:], 8)) |
3367
7f486971d263
Add git-1.4 binary patch support
Brendan Cully <brendan@kublai.com>
parents:
3329
diff
changeset
|
400 elif line.startswith('GIT binary patch'): |
7f486971d263
Add git-1.4 binary patch support
Brendan Cully <brendan@kublai.com>
parents:
3329
diff
changeset
|
401 gp.binary = True |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
402 if gp: |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
403 gitpatches.append(gp) |
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
404 |
12669
b0fa39c68370
patch: remove unused flags from readgitpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
12645
diff
changeset
|
405 return gitpatches |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
406 |
8891
5fe8dc75aa4a
patch: use new style class in linereader
Simon Heimberg <simohe@besonet.ch>
parents:
8843
diff
changeset
|
407 class linereader(object): |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
408 # simple class to allow pushing lines back into the input stream |
14418
0174d1f79280
patch: remove EOL support from linereader class
Patrick Mezard <pmezard@gmail.com>
parents:
14402
diff
changeset
|
409 def __init__(self, fp): |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
410 self.fp = fp |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
411 self.buf = [] |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
412 |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
413 def push(self, line): |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
414 if line is not None: |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
415 self.buf.append(line) |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
416 |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
417 def readline(self): |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
418 if self.buf: |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
419 l = self.buf[0] |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
420 del self.buf[0] |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
421 return l |
14418
0174d1f79280
patch: remove EOL support from linereader class
Patrick Mezard <pmezard@gmail.com>
parents:
14402
diff
changeset
|
422 return self.fp.readline() |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
423 |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
424 def __iter__(self): |
29726
160c829dd5d0
patch: use `iter(callable, sentinel)` instead of while True
Augie Fackler <augie@google.com>
parents:
29422
diff
changeset
|
425 return iter(self.readline, '') |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
426 |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
427 class abstractbackend(object): |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
428 def __init__(self, ui): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
429 self.ui = ui |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
430 |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
431 def getfile(self, fname): |
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
432 """Return target file data and flags as a (data, (islink, |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
433 isexec)) tuple. Data is None if file is missing/deleted. |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
434 """ |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
435 raise NotImplementedError |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
436 |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
437 def setfile(self, fname, data, mode, copysource): |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
438 """Write data to target file fname and set its mode. mode is a |
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
439 (islink, isexec) tuple. If data is None, the file content should |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
440 be left unchanged. If the file is modified after being copied, |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
441 copysource is set to the original file name. |
14367
468d7d1744b4
patch: set desired mode when patching, not in updatedir()
Patrick Mezard <pmezard@gmail.com>
parents:
14366
diff
changeset
|
442 """ |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
443 raise NotImplementedError |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
444 |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
445 def unlink(self, fname): |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
446 """Unlink target file.""" |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
447 raise NotImplementedError |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
448 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
449 def writerej(self, fname, failed, total, lines): |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
450 """Write rejected lines for fname. total is the number of hunks |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
451 which failed to apply and total the total number of hunks for this |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
452 files. |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
453 """ |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
454 |
14351
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
455 def exists(self, fname): |
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
456 raise NotImplementedError |
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
457 |
33155
b8ae289a7707
patch: add close() to abstractbackend
Martin von Zweigbergk <martinvonz@google.com>
parents:
33104
diff
changeset
|
458 def close(self): |
b8ae289a7707
patch: add close() to abstractbackend
Martin von Zweigbergk <martinvonz@google.com>
parents:
33104
diff
changeset
|
459 raise NotImplementedError |
b8ae289a7707
patch: add close() to abstractbackend
Martin von Zweigbergk <martinvonz@google.com>
parents:
33104
diff
changeset
|
460 |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
461 class fsbackend(abstractbackend): |
14350
00da6624e167
patch: move copyfile() into backends, abstract basedir
Patrick Mezard <pmezard@gmail.com>
parents:
14349
diff
changeset
|
462 def __init__(self, ui, basedir): |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
463 super(fsbackend, self).__init__(ui) |
31233
067f2a95e32c
vfs: use 'vfs' module directly in 'mercurial.patch'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31216
diff
changeset
|
464 self.opener = vfsmod.vfs(basedir) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
465 |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
466 def getfile(self, fname): |
21717
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
467 if self.opener.islink(fname): |
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
468 return (self.opener.readlink(fname), (True, False)) |
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
469 |
14531
b88368a3ade4
patch: remove redundant islink() call
Patrick Mezard <pmezard@gmail.com>
parents:
14494
diff
changeset
|
470 isexec = False |
7392
564326a6ef9c
patch: isolate patchfile filesystem calls into methods
Patrick Mezard <pmezard@gmail.com>
parents:
7391
diff
changeset
|
471 try: |
25658
e93036747902
global: mass rewrite to use modern octal syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25644
diff
changeset
|
472 isexec = self.opener.lstat(fname).st_mode & 0o100 != 0 |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25658
diff
changeset
|
473 except OSError as e: |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
474 if e.errno != errno.ENOENT: |
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
475 raise |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
476 try: |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
477 return (self.opener.read(fname), (False, isexec)) |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25658
diff
changeset
|
478 except IOError as e: |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
479 if e.errno != errno.ENOENT: |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
480 raise |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
481 return None, None |
7392
564326a6ef9c
patch: isolate patchfile filesystem calls into methods
Patrick Mezard <pmezard@gmail.com>
parents:
7391
diff
changeset
|
482 |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
483 def setfile(self, fname, data, mode, copysource): |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
484 islink, isexec = mode |
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
485 if data is None: |
21717
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
486 self.opener.setflags(fname, islink, isexec) |
14390
ce77c275bec3
patch: merge backend setmode() into writelines()
Patrick Mezard <pmezard@gmail.com>
parents:
14389
diff
changeset
|
487 return |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
488 if islink: |
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
489 self.opener.symlink(data, fname) |
14367
468d7d1744b4
patch: set desired mode when patching, not in updatedir()
Patrick Mezard <pmezard@gmail.com>
parents:
14366
diff
changeset
|
490 else: |
14391
1e64e1e12195
patch: unify backend file access interface
Patrick Mezard <pmezard@gmail.com>
parents:
14390
diff
changeset
|
491 self.opener.write(fname, data) |
14367
468d7d1744b4
patch: set desired mode when patching, not in updatedir()
Patrick Mezard <pmezard@gmail.com>
parents:
14366
diff
changeset
|
492 if isexec: |
21717
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
493 self.opener.setflags(fname, False, True) |
7392
564326a6ef9c
patch: isolate patchfile filesystem calls into methods
Patrick Mezard <pmezard@gmail.com>
parents:
7391
diff
changeset
|
494 |
564326a6ef9c
patch: isolate patchfile filesystem calls into methods
Patrick Mezard <pmezard@gmail.com>
parents:
7391
diff
changeset
|
495 def unlink(self, fname): |
21717
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
496 self.opener.unlinkpath(fname, ignoremissing=True) |
7392
564326a6ef9c
patch: isolate patchfile filesystem calls into methods
Patrick Mezard <pmezard@gmail.com>
parents:
7391
diff
changeset
|
497 |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
498 def writerej(self, fname, failed, total, lines): |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
499 fname = fname + ".rej" |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
500 self.ui.warn( |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
501 _("%d out of %d hunks FAILED -- saving rejects to file %s\n") % |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
502 (failed, total, fname)) |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
503 fp = self.opener(fname, 'w') |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
504 fp.writelines(lines) |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
505 fp.close() |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
506 |
14351
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
507 def exists(self, fname): |
21717
2a095d3442e0
patch: replace functions in fsbackend to use vfs
Chinmay Joshi <c@chinmayjoshi.com>
parents:
21553
diff
changeset
|
508 return self.opener.lexists(fname) |
14351
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
509 |
14370
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
510 class workingbackend(fsbackend): |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
511 def __init__(self, ui, repo, similarity): |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
512 super(workingbackend, self).__init__(ui, repo.root) |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
513 self.repo = repo |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
514 self.similarity = similarity |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
515 self.removed = set() |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
516 self.changed = set() |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
517 self.copied = [] |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
518 |
14453
ea3d548132cc
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
519 def _checkknown(self, fname): |
ea3d548132cc
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
520 if self.repo.dirstate[fname] == '?' and self.exists(fname): |
ea3d548132cc
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
521 raise PatchError(_('cannot patch %s: file is not tracked') % fname) |
ea3d548132cc
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
522 |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
523 def setfile(self, fname, data, mode, copysource): |
14453
ea3d548132cc
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
524 self._checkknown(fname) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
525 super(workingbackend, self).setfile(fname, data, mode, copysource) |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
526 if copysource is not None: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
527 self.copied.append((copysource, fname)) |
14370
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
528 self.changed.add(fname) |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
529 |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
530 def unlink(self, fname): |
14453
ea3d548132cc
patch: do not patch unknown files (issue752)
Patrick Mezard <pmezard@gmail.com>
parents:
14452
diff
changeset
|
531 self._checkknown(fname) |
14370
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
532 super(workingbackend, self).unlink(fname) |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
533 self.removed.add(fname) |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
534 self.changed.add(fname) |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
535 |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
536 def close(self): |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
537 wctx = self.repo[None] |
19155
0b3689a08df5
patch: use scmutil.marktouched instead of scmutil.addremove
Siddharth Agarwal <sid0@fb.com>
parents:
18830
diff
changeset
|
538 changed = set(self.changed) |
14370
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
539 for src, dst in self.copied: |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
540 scmutil.dirstatecopy(self.ui, self.repo, wctx, src, dst) |
16112
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15971
diff
changeset
|
541 if self.removed: |
14435
5f6090e559fa
context: make forget work like commands.forget
Matt Mackall <mpm@selenic.com>
parents:
14418
diff
changeset
|
542 wctx.forget(sorted(self.removed)) |
16112
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15971
diff
changeset
|
543 for f in self.removed: |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15971
diff
changeset
|
544 if f not in self.repo.dirstate: |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15971
diff
changeset
|
545 # File was deleted and no longer belongs to the |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15971
diff
changeset
|
546 # dirstate, it was probably marked added then |
d7829b2ecf32
import: handle git renames and --similarity (issue3187)
Patrick Mezard <patrick@mezard.eu>
parents:
15971
diff
changeset
|
547 # deleted, and should not be considered by |
19155
0b3689a08df5
patch: use scmutil.marktouched instead of scmutil.addremove
Siddharth Agarwal <sid0@fb.com>
parents:
18830
diff
changeset
|
548 # marktouched(). |
0b3689a08df5
patch: use scmutil.marktouched instead of scmutil.addremove
Siddharth Agarwal <sid0@fb.com>
parents:
18830
diff
changeset
|
549 changed.discard(f) |
0b3689a08df5
patch: use scmutil.marktouched instead of scmutil.addremove
Siddharth Agarwal <sid0@fb.com>
parents:
18830
diff
changeset
|
550 if changed: |
0b3689a08df5
patch: use scmutil.marktouched instead of scmutil.addremove
Siddharth Agarwal <sid0@fb.com>
parents:
18830
diff
changeset
|
551 scmutil.marktouched(self.repo, changed, self.similarity) |
14370
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
552 return sorted(self.changed) |
17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14369
diff
changeset
|
553 |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
554 class filestore(object): |
14658
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
555 def __init__(self, maxsize=None): |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
556 self.opener = None |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
557 self.files = {} |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
558 self.created = 0 |
14658
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
559 self.maxsize = maxsize |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
560 if self.maxsize is None: |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
561 self.maxsize = 4*(2**20) |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
562 self.size = 0 |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
563 self.data = {} |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
564 |
14609
f53dc0787424
patch: extend filtestore to store an optional copy source
Patrick Mezard <pmezard@gmail.com>
parents:
14566
diff
changeset
|
565 def setfile(self, fname, data, mode, copied=None): |
14658
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
566 if self.maxsize < 0 or (len(data) + self.size) <= self.maxsize: |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
567 self.data[fname] = (data, mode, copied) |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
568 self.size += len(data) |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
569 else: |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
570 if self.opener is None: |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
571 root = tempfile.mkdtemp(prefix='hg-patch-') |
31233
067f2a95e32c
vfs: use 'vfs' module directly in 'mercurial.patch'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31216
diff
changeset
|
572 self.opener = vfsmod.vfs(root) |
14658
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
573 # Avoid filename issues with these simple names |
36423
2831d918e1b4
py3: convert known-int values to bytes using %d
Augie Fackler <augie@google.com>
parents:
36229
diff
changeset
|
574 fn = '%d' % self.created |
14658
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
575 self.opener.write(fn, data) |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
576 self.created += 1 |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
577 self.files[fname] = (fn, mode, copied) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
578 |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
579 def getfile(self, fname): |
14658
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
580 if fname in self.data: |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
581 return self.data[fname] |
7ddf9a607b75
patch: make filestore store data in memory and fallback to fs
Patrick Mezard <pmezard@gmail.com>
parents:
14611
diff
changeset
|
582 if not self.opener or fname not in self.files: |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
583 return None, None, None |
14609
f53dc0787424
patch: extend filtestore to store an optional copy source
Patrick Mezard <pmezard@gmail.com>
parents:
14566
diff
changeset
|
584 fn, mode, copied = self.files[fname] |
f53dc0787424
patch: extend filtestore to store an optional copy source
Patrick Mezard <pmezard@gmail.com>
parents:
14566
diff
changeset
|
585 return self.opener.read(fn), mode, copied |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
586 |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
587 def close(self): |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
588 if self.opener: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
589 shutil.rmtree(self.opener.base) |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
590 |
14611
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
591 class repobackend(abstractbackend): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
592 def __init__(self, ui, repo, ctx, store): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
593 super(repobackend, self).__init__(ui) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
594 self.repo = repo |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
595 self.ctx = ctx |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
596 self.store = store |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
597 self.changed = set() |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
598 self.removed = set() |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
599 self.copied = {} |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
600 |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
601 def _checkknown(self, fname): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
602 if fname not in self.ctx: |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
603 raise PatchError(_('cannot patch %s: file is not tracked') % fname) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
604 |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
605 def getfile(self, fname): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
606 try: |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
607 fctx = self.ctx[fname] |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
608 except error.LookupError: |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
609 return None, None |
14611
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
610 flags = fctx.flags() |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
611 return fctx.data(), ('l' in flags, 'x' in flags) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
612 |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
613 def setfile(self, fname, data, mode, copysource): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
614 if copysource: |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
615 self._checkknown(copysource) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
616 if data is None: |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
617 data = self.ctx[fname].data() |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
618 self.store.setfile(fname, data, mode, copysource) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
619 self.changed.add(fname) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
620 if copysource: |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
621 self.copied[fname] = copysource |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
622 |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
623 def unlink(self, fname): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
624 self._checkknown(fname) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
625 self.removed.add(fname) |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
626 |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
627 def exists(self, fname): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
628 return fname in self.ctx |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
629 |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
630 def close(self): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
631 return self.changed | self.removed |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
632 |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
633 # @@ -start,len +start,len @@ or @@ -start +start @@ if len is 1 |
15510
5414b56cfad6
patch: simplify hunk extents parsing
Patrick Mezard <pmezard@gmail.com>
parents:
15462
diff
changeset
|
634 unidesc = re.compile('@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@') |
5414b56cfad6
patch: simplify hunk extents parsing
Patrick Mezard <pmezard@gmail.com>
parents:
15462
diff
changeset
|
635 contextdesc = re.compile('(?:---|\*\*\*) (\d+)(?:,(\d+))? (?:---|\*\*\*)') |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
636 eolmodes = ['strict', 'crlf', 'lf', 'auto'] |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
637 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
638 class patchfile(object): |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
639 def __init__(self, ui, gp, backend, store, eolmode='strict'): |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
640 self.fname = gp.path |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
641 self.eolmode = eolmode |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
642 self.eol = None |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
643 self.backend = backend |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
644 self.ui = ui |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
645 self.lines = [] |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
646 self.exists = False |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
647 self.missing = True |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
648 self.mode = gp.mode |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
649 self.copysource = gp.oldpath |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
650 self.create = gp.op in ('ADD', 'COPY', 'RENAME') |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
651 self.remove = gp.op == 'DELETE' |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
652 if self.copysource is None: |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
653 data, mode = backend.getfile(self.fname) |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
654 else: |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
655 data, mode = store.getfile(self.copysource)[:2] |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
656 if data is not None: |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
657 self.exists = self.copysource is None or backend.exists(self.fname) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
658 self.missing = False |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
659 if data: |
14832
d60e4f227d75
patch: fix parsing patch files containing CRs not followed by LFs
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
14764
diff
changeset
|
660 self.lines = mdiff.splitnewlines(data) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
661 if self.mode is None: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
662 self.mode = mode |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
663 if self.lines: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
664 # Normalize line endings |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
665 if self.lines[0].endswith('\r\n'): |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
666 self.eol = '\r\n' |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
667 elif self.lines[0].endswith('\n'): |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
668 self.eol = '\n' |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
669 if eolmode != 'strict': |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
670 nlines = [] |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
671 for l in self.lines: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
672 if l.endswith('\r\n'): |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
673 l = l[:-2] + '\n' |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
674 nlines.append(l) |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
675 self.lines = nlines |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
676 else: |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
677 if self.create: |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
678 self.missing = False |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
679 if self.mode is None: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
680 self.mode = (False, False) |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
681 if self.missing: |
17299
e51d4aedace9
check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents:
16834
diff
changeset
|
682 self.ui.warn(_("unable to find '%s' for patching\n") % self.fname) |
29900
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29726
diff
changeset
|
683 self.ui.warn(_("(use '--prefix' to apply patch relative to the " |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29726
diff
changeset
|
684 "current directory)\n")) |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
685 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
686 self.hash = {} |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
687 self.dirty = 0 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
688 self.offset = 0 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
689 self.skew = 0 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
690 self.rej = [] |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
691 self.fileprinted = False |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
692 self.printfile(False) |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
693 self.hunks = 0 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
694 |
14367
468d7d1744b4
patch: set desired mode when patching, not in updatedir()
Patrick Mezard <pmezard@gmail.com>
parents:
14366
diff
changeset
|
695 def writelines(self, fname, lines, mode): |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
696 if self.eolmode == 'auto': |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
697 eol = self.eol |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
698 elif self.eolmode == 'crlf': |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
699 eol = '\r\n' |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
700 else: |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
701 eol = '\n' |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
702 |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
703 if self.eolmode != 'strict' and eol and eol != '\n': |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
704 rawlines = [] |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
705 for l in lines: |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
706 if l and l[-1] == '\n': |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
707 l = l[:-1] + eol |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
708 rawlines.append(l) |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
709 lines = rawlines |
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
710 |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
711 self.backend.setfile(fname, ''.join(lines), mode, self.copysource) |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
712 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
713 def printfile(self, warn): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
714 if self.fileprinted: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
715 return |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
716 if warn or self.ui.verbose: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
717 self.fileprinted = True |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
718 s = _("patching file %s\n") % self.fname |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
719 if warn: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
720 self.ui.warn(s) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
721 else: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
722 self.ui.note(s) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
723 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
724 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
725 def findlines(self, l, linenum): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
726 # looks through the hash and finds candidate lines. The |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
727 # result is a list of line numbers sorted based on distance |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
728 # from linenum |
5143
d4fa6bafc43a
Remove trailing spaces, fix indentation
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5116
diff
changeset
|
729 |
9681
ac3a68cb16eb
patch: simplify logic
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9642
diff
changeset
|
730 cand = self.hash.get(l, []) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
731 if len(cand) > 1: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
732 # resort our list of potentials forward then back. |
9032
1fa80c5428b8
compat: use 'key' argument instead of 'cmp' when sorting a list
Alejandro Santos <alejolp@alejolp.com>
parents:
9031
diff
changeset
|
733 cand.sort(key=lambda x: abs(x - linenum)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
734 return cand |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
735 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
736 def write_rej(self): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
737 # our rejects are a little different from patch(1). This always |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
738 # creates rejects in the same form as the original patch. A file |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
739 # header is inserted so that you can run the reject through patch again |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
740 # without having to type the filename. |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
741 if not self.rej: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
742 return |
14349
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
743 base = os.path.basename(self.fname) |
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
744 lines = ["--- %s\n+++ %s\n" % (base, base)] |
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
745 for x in self.rej: |
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
746 for l in x.hunk: |
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
747 lines.append(l) |
31715
6c80f985a13c
diff: slice over bytes to make sure conditions work normally
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31631
diff
changeset
|
748 if l[-1:] != '\n': |
14349
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
749 lines.append("\n\ No newline at end of file\n") |
776ae95b8835
patch: merge makerejlines() into write_rej()
Patrick Mezard <pmezard@gmail.com>
parents:
14348
diff
changeset
|
750 self.backend.writerej(self.fname, len(self.rej), self.hunks, lines) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
751 |
9393
23c4e772c172
patch: remove the unused, broken reverse() function
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9392
diff
changeset
|
752 def apply(self, h): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
753 if not h.complete(): |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
754 raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
755 (h.number, h.desc, len(h.a), h.lena, len(h.b), |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
756 h.lenb)) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
757 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
758 self.hunks += 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
759 |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
760 if self.missing: |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
761 self.rej.append(h) |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
762 return -1 |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
763 |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
764 if self.exists and self.create: |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
765 if self.copysource: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
766 self.ui.warn(_("cannot create %s: destination already " |
20869
9658a79968c6
i18n: fix "% inside _()" problems
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20137
diff
changeset
|
767 "exists\n") % self.fname) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
768 else: |
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
769 self.ui.warn(_("file %s already exists\n") % self.fname) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
770 self.rej.append(h) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
771 return -1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
772 |
9585
ea1935e2020a
patch: handle symlinks without symlinkhunk
Patrick Mezard <pmezard@gmail.com>
parents:
9573
diff
changeset
|
773 if isinstance(h, binhunk): |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
774 if self.remove: |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
775 self.backend.unlink(self.fname) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
776 else: |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
777 l = h.new(self.lines) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
778 self.lines[:] = l |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
779 self.offset += len(l) |
14217
71d5287351e9
patchfile: use real Booleans instead of 0/1
Martin Geisler <mg@aragost.com>
parents:
14017
diff
changeset
|
780 self.dirty = True |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
781 return 0 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
782 |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
783 horig = h |
10128
ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
Patrick Mezard <pmezard@gmail.com>
parents:
10127
diff
changeset
|
784 if (self.eolmode in ('crlf', 'lf') |
ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
Patrick Mezard <pmezard@gmail.com>
parents:
10127
diff
changeset
|
785 or self.eolmode == 'auto' and self.eol): |
ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
Patrick Mezard <pmezard@gmail.com>
parents:
10127
diff
changeset
|
786 # If new eols are going to be normalized, then normalize |
ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
Patrick Mezard <pmezard@gmail.com>
parents:
10127
diff
changeset
|
787 # hunk data before patching. Otherwise, preserve input |
ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
Patrick Mezard <pmezard@gmail.com>
parents:
10127
diff
changeset
|
788 # line-endings. |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
789 h = h.getnormalized() |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
790 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
791 # fast case first, no offsets, no fuzz |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
792 old, oldstart, new, newstart = h.fuzzit(0, False) |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
793 oldstart += self.offset |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
794 orig_start = oldstart |
10135
9a4034b630c4
patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
9725
diff
changeset
|
795 # if there's skew we want to emit the "(offset %d lines)" even |
9a4034b630c4
patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
9725
diff
changeset
|
796 # when the hunk cleanly applies at start + skew, so skip the |
9a4034b630c4
patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
9725
diff
changeset
|
797 # fast case code |
37574
a1bcc7ff0eac
diffhelpers: make return value of testhunk() more Pythonic
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
798 if self.skew == 0 and diffhelpers.testhunk(old, self.lines, oldstart): |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
799 if self.remove: |
14348
c1c719103392
patch: extract fs access from patchfile into fsbackend
Patrick Mezard <pmezard@gmail.com>
parents:
14347
diff
changeset
|
800 self.backend.unlink(self.fname) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
801 else: |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
802 self.lines[oldstart:oldstart + len(old)] = new |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
803 self.offset += len(new) - len(old) |
14217
71d5287351e9
patchfile: use real Booleans instead of 0/1
Martin Geisler <mg@aragost.com>
parents:
14017
diff
changeset
|
804 self.dirty = True |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
805 return 0 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
806 |
13700
63307feb59dd
patch: inline patchfile.hashlines()
Patrick Mezard <pmezard@gmail.com>
parents:
13699
diff
changeset
|
807 # ok, we couldn't match the hunk. Lets look for offsets and fuzz it |
63307feb59dd
patch: inline patchfile.hashlines()
Patrick Mezard <pmezard@gmail.com>
parents:
13699
diff
changeset
|
808 self.hash = {} |
63307feb59dd
patch: inline patchfile.hashlines()
Patrick Mezard <pmezard@gmail.com>
parents:
13699
diff
changeset
|
809 for x, s in enumerate(self.lines): |
63307feb59dd
patch: inline patchfile.hashlines()
Patrick Mezard <pmezard@gmail.com>
parents:
13699
diff
changeset
|
810 self.hash.setdefault(s, []).append(x) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
811 |
32990
1d5d7e2b7ab5
configitems: register 'patch.fuzz' as first example for 'configint'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32979
diff
changeset
|
812 for fuzzlen in xrange(self.ui.configint("patch", "fuzz") + 1): |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
813 for toponly in [True, False]: |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
814 old, oldstart, new, newstart = h.fuzzit(fuzzlen, toponly) |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
815 oldstart = oldstart + self.offset + self.skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
816 oldstart = min(oldstart, len(self.lines)) |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
817 if old: |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
818 cand = self.findlines(old[0][1:], oldstart) |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
819 else: |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
820 # Only adding lines with no or fuzzed context, just |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
821 # take the skew in account |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16122
diff
changeset
|
822 cand = [oldstart] |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
823 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
824 for l in cand: |
37574
a1bcc7ff0eac
diffhelpers: make return value of testhunk() more Pythonic
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
825 if not old or diffhelpers.testhunk(old, self.lines, l): |
16121
ccba74472af2
patch: fuzz old and new lines at the same time
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
826 self.lines[l : l + len(old)] = new |
ccba74472af2
patch: fuzz old and new lines at the same time
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
827 self.offset += len(new) - len(old) |
10135
9a4034b630c4
patch: better handling of sequence of offset patch hunks (issue1941)
Greg Onufer <gonufer@jazzhaiku.com>
parents:
9725
diff
changeset
|
828 self.skew = l - orig_start |
14217
71d5287351e9
patchfile: use real Booleans instead of 0/1
Martin Geisler <mg@aragost.com>
parents:
14017
diff
changeset
|
829 self.dirty = True |
10518
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
830 offset = l - orig_start - fuzzlen |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
831 if fuzzlen: |
10518
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
832 msg = _("Hunk #%d succeeded at %d " |
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
833 "with fuzz %d " |
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
834 "(offset %d lines).\n") |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
835 self.printfile(True) |
10518
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
836 self.ui.warn(msg % |
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
837 (h.number, l + 1, fuzzlen, offset)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
838 else: |
10518
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
839 msg = _("Hunk #%d succeeded at %d " |
8090
388bb482024e
patch, i18n: avoid parameterized plural
Wagner Bruna <wbruna@yahoo.com>
parents:
7972
diff
changeset
|
840 "(offset %d lines).\n") |
10518
5fe51d348daf
patch, i18n: avoid parameterized messages
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10501
diff
changeset
|
841 self.ui.note(msg % (h.number, l + 1, offset)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
842 return fuzzlen |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
843 self.printfile(True) |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
844 self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start)) |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
845 self.rej.append(horig) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
846 return -1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
847 |
13701
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
848 def close(self): |
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
849 if self.dirty: |
14367
468d7d1744b4
patch: set desired mode when patching, not in updatedir()
Patrick Mezard <pmezard@gmail.com>
parents:
14366
diff
changeset
|
850 self.writelines(self.fname, self.lines, self.mode) |
13701
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
851 self.write_rej() |
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
852 return len(self.rej) |
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
853 |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
854 class header(object): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
855 """patch header |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
856 """ |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
857 diffgit_re = re.compile('diff --git a/(.*) b/(.*)$') |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
858 diff_re = re.compile('diff -r .* (.*)$') |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
859 allhunks_re = re.compile('(?:index|deleted file) ') |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
860 pretty_re = re.compile('(?:new file|deleted file) ') |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
861 special_re = re.compile('(?:index|deleted|copy|rename) ') |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
862 newfile_re = re.compile('(?:new file)') |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
863 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
864 def __init__(self, header): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
865 self.header = header |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
866 self.hunks = [] |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
867 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
868 def binary(self): |
25149
3f0744eeaeaf
cleanup: use __builtins__.any instead of util.any
Augie Fackler <augie@google.com>
parents:
25138
diff
changeset
|
869 return any(h.startswith('index ') for h in self.header) |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
870 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
871 def pretty(self, fp): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
872 for h in self.header: |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
873 if h.startswith('index '): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
874 fp.write(_('this modifies a binary file (all or nothing)\n')) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
875 break |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
876 if self.pretty_re.match(h): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
877 fp.write(h) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
878 if self.binary(): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
879 fp.write(_('this is a binary file\n')) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
880 break |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
881 if h.startswith('---'): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
882 fp.write(_('%d hunks, %d lines changed\n') % |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
883 (len(self.hunks), |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
884 sum([max(h.added, h.removed) for h in self.hunks]))) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
885 break |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
886 fp.write(h) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
887 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
888 def write(self, fp): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
889 fp.write(''.join(self.header)) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
890 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
891 def allhunks(self): |
25149
3f0744eeaeaf
cleanup: use __builtins__.any instead of util.any
Augie Fackler <augie@google.com>
parents:
25138
diff
changeset
|
892 return any(self.allhunks_re.match(h) for h in self.header) |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
893 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
894 def files(self): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
895 match = self.diffgit_re.match(self.header[0]) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
896 if match: |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
897 fromfile, tofile = match.groups() |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
898 if fromfile == tofile: |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
899 return [fromfile] |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
900 return [fromfile, tofile] |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
901 else: |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
902 return self.diff_re.match(self.header[0]).groups() |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
903 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
904 def filename(self): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
905 return self.files()[-1] |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
906 |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
907 def __repr__(self): |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
908 return '<header %s>' % (' '.join(map(repr, self.files()))) |
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
909 |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
910 def isnewfile(self): |
25149
3f0744eeaeaf
cleanup: use __builtins__.any instead of util.any
Augie Fackler <augie@google.com>
parents:
25138
diff
changeset
|
911 return any(self.newfile_re.match(h) for h in self.header) |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
912 |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
913 def special(self): |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
914 # Special files are shown only at the header level and not at the hunk |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
915 # level for example a file that has been deleted is a special file. |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
916 # The user cannot change the content of the operation, in the case of |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
917 # the deleted file he has to take the deletion or not take it, he |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
918 # cannot take some of it. |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
919 # Newly added files are special if they are empty, they are not special |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
920 # if they have some content as we want to be able to change it |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
921 nocontent = len(self.header) == 2 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
922 emptynewfile = self.isnewfile() and nocontent |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
923 return emptynewfile or \ |
25149
3f0744eeaeaf
cleanup: use __builtins__.any instead of util.any
Augie Fackler <augie@google.com>
parents:
25138
diff
changeset
|
924 any(self.special_re.match(h) for h in self.header) |
24261
20aac24e2114
record: move header class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24260
diff
changeset
|
925 |
24263
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
926 class recordhunk(object): |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
927 """patch hunk |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
928 |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
929 XXX shouldn't we merge this with the other hunk class? |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
930 """ |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
931 |
33270
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
932 def __init__(self, header, fromline, toline, proc, before, hunk, after, |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
933 maxcontext=None): |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
934 def trimcontext(lines, reverse=False): |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
935 if maxcontext is not None: |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
936 delta = len(lines) - maxcontext |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
937 if delta > 0: |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
938 if reverse: |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
939 return delta, lines[delta:] |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
940 else: |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
941 return delta, lines[:maxcontext] |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
942 return 0, lines |
24263
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
943 |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
944 self.header = header |
33270
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
945 trimedbefore, self.before = trimcontext(before, True) |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
946 self.fromline = fromline + trimedbefore |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
947 self.toline = toline + trimedbefore |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
948 _trimedafter, self.after = trimcontext(after, False) |
24263
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
949 self.proc = proc |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
950 self.hunk = hunk |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
951 self.added, self.removed = self.countchanges(self.hunk) |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
952 |
24346
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
953 def __eq__(self, v): |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
954 if not isinstance(v, recordhunk): |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
955 return False |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
956 |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
957 return ((v.hunk == self.hunk) and |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
958 (v.proc == self.proc) and |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
959 (self.fromline == v.fromline) and |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
960 (self.header.files() == v.header.files())) |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
961 |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
962 def __hash__(self): |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
963 return hash((tuple(self.hunk), |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
964 tuple(self.header.files()), |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
965 self.fromline, |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
966 self.proc)) |
31edcea517c1
record: add comparison methods for recordhunk class
Laurent Charignon <lcharignon@fb.com>
parents:
24341
diff
changeset
|
967 |
24263
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
968 def countchanges(self, hunk): |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
969 """hunk -> (n+,n-)""" |
34252
c43d055ae405
py3: stop using bytes[n] in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34251
diff
changeset
|
970 add = len([h for h in hunk if h.startswith('+')]) |
c43d055ae405
py3: stop using bytes[n] in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34251
diff
changeset
|
971 rem = len([h for h in hunk if h.startswith('-')]) |
24263
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
972 return add, rem |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
973 |
32979
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
974 def reversehunk(self): |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
975 """return another recordhunk which is the reverse of the hunk |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
976 |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
977 If this hunk is diff(A, B), the returned hunk is diff(B, A). To do |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
978 that, swap fromline/toline and +/- signs while keep other things |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
979 unchanged. |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
980 """ |
33884
5707bfe04deb
record: fix revert -i for lines without newline (issue5651)
Jun Wu <quark@fb.com>
parents:
33584
diff
changeset
|
981 m = {'+': '-', '-': '+', '\\': '\\'} |
34252
c43d055ae405
py3: stop using bytes[n] in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34251
diff
changeset
|
982 hunk = ['%s%s' % (m[l[0:1]], l[1:]) for l in self.hunk] |
32979
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
983 return recordhunk(self.header, self.toline, self.fromline, self.proc, |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
984 self.before, hunk, self.after) |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
985 |
24263
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
986 def write(self, fp): |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
987 delta = len(self.before) + len(self.after) |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
988 if self.after and self.after[-1] == '\\ No newline at end of file\n': |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
989 delta -= 1 |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
990 fromlen = delta + self.removed |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
991 tolen = delta + self.added |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
992 fp.write('@@ -%d,%d +%d,%d @@%s\n' % |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
993 (self.fromline, fromlen, self.toline, tolen, |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
994 self.proc and (' ' + self.proc))) |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
995 fp.write(''.join(self.before + self.hunk + self.after)) |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
996 |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
997 pretty = write |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
998 |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
999 def filename(self): |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
1000 return self.header.filename() |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
1001 |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
1002 def __repr__(self): |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
1003 return '<hunk %r@%d>' % (self.filename(), self.fromline) |
a45d1c51109e
record: move hunk class from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24261
diff
changeset
|
1004 |
34566
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1005 def getmessages(): |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1006 return { |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1007 'multiple': { |
34968
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1008 'apply': _("apply change %d/%d to '%s'?"), |
34566
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1009 'discard': _("discard change %d/%d to '%s'?"), |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1010 'record': _("record change %d/%d to '%s'?"), |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1011 }, |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1012 'single': { |
34968
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1013 'apply': _("apply this change to '%s'?"), |
34566
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1014 'discard': _("discard this change to '%s'?"), |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1015 'record': _("record this change to '%s'?"), |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1016 }, |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1017 'help': { |
34968
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1018 'apply': _('[Ynesfdaq?]' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1019 '$$ &Yes, apply this change' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1020 '$$ &No, skip this change' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1021 '$$ &Edit this change manually' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1022 '$$ &Skip remaining changes to this file' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1023 '$$ Apply remaining changes to this &file' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1024 '$$ &Done, skip remaining changes and files' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1025 '$$ Apply &all changes to all remaining files' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1026 '$$ &Quit, applying no changes' |
3649c3f2cd90
revert: do not reverse hunks in interactive when REV is not parent (issue5096)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34964
diff
changeset
|
1027 '$$ &? (display help)'), |
34566
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1028 'discard': _('[Ynesfdaq?]' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1029 '$$ &Yes, discard this change' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1030 '$$ &No, skip this change' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1031 '$$ &Edit this change manually' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1032 '$$ &Skip remaining changes to this file' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1033 '$$ Discard remaining changes to this &file' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1034 '$$ &Done, skip remaining changes and files' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1035 '$$ Discard &all changes to all remaining files' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1036 '$$ &Quit, discarding no changes' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1037 '$$ &? (display help)'), |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1038 'record': _('[Ynesfdaq?]' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1039 '$$ &Yes, record this change' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1040 '$$ &No, skip this change' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1041 '$$ &Edit this change manually' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1042 '$$ &Skip remaining changes to this file' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1043 '$$ Record remaining changes to this &file' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1044 '$$ &Done, skip remaining changes and files' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1045 '$$ Record &all changes to all remaining files' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1046 '$$ &Quit, recording no changes' |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1047 '$$ &? (display help)'), |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1048 } |
34042
c0170d88ed2b
patch: take messages out of the function so that extensions can add entries
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34013
diff
changeset
|
1049 } |
c0170d88ed2b
patch: take messages out of the function so that extensions can add entries
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34013
diff
changeset
|
1050 |
25310
c1f5ef76d1c2
record: add an operation arguments to customize recording ui
Laurent Charignon <lcharignon@fb.com>
parents:
25149
diff
changeset
|
1051 def filterpatch(ui, headers, operation=None): |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1052 """Interactively filter patch chunks into applied-only chunks""" |
34566
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1053 messages = getmessages() |
60213a2eca81
patch: do not cache translated messages (API)
Jun Wu <quark@fb.com>
parents:
34561
diff
changeset
|
1054 |
25359
724421cb4745
record: add default value for operation argument
Laurent Charignon <lcharignon@fb.com>
parents:
25310
diff
changeset
|
1055 if operation is None: |
29326
d48fc6f318a3
patch: define full messages for interactive record/revert
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
29283
diff
changeset
|
1056 operation = 'record' |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1057 |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1058 def prompt(skipfile, skipall, query, chunk): |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1059 """prompt query, and process base inputs |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1060 |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1061 - y/n for the rest of file |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1062 - y/n for the rest |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1063 - ? (help) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1064 - q (quit) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1065 |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1066 Return True/False and possibly updated skipfile and skipall. |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1067 """ |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1068 newpatches = None |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1069 if skipall is not None: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1070 return skipall, skipfile, skipall, newpatches |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1071 if skipfile is not None: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1072 return skipfile, skipfile, skipall, newpatches |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1073 while True: |
34042
c0170d88ed2b
patch: take messages out of the function so that extensions can add entries
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34013
diff
changeset
|
1074 resps = messages['help'][operation] |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1075 r = ui.promptchoice("%s %s" % (query, resps)) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1076 ui.write("\n") |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1077 if r == 8: # ? |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1078 for c, t in ui.extractchoices(resps)[1]: |
29154
9d38a2061fd8
patch: show lower-ed translated message correctly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
28861
diff
changeset
|
1079 ui.write('%s - %s\n' % (c, encoding.lower(t))) |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1080 continue |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1081 elif r == 0: # yes |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1082 ret = True |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1083 elif r == 1: # no |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1084 ret = False |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1085 elif r == 2: # Edit patch |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1086 if chunk is None: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1087 ui.write(_('cannot edit patch for whole file')) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1088 ui.write("\n") |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1089 continue |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1090 if chunk.header.binary(): |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1091 ui.write(_('cannot edit patch for binary file')) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1092 ui.write("\n") |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1093 continue |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1094 # Patch comment based on the Git one (based on comment at end of |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
25660
diff
changeset
|
1095 # https://mercurial-scm.org/wiki/RecordExtension) |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1096 phelp = '---' + _(""" |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1097 To remove '-' lines, make them ' ' lines (context). |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1098 To remove '+' lines, delete them. |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1099 Lines starting with # will be removed from the patch. |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1100 |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1101 If the patch applies cleanly, the edited hunk will immediately be |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1102 added to the record list. If it does not apply cleanly, a rejects |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1103 file will be generated: you can use that when you try again. If |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1104 all lines of the hunk are removed, then the edit is aborted and |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1105 the hunk is left unchanged. |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1106 """) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1107 (patchfd, patchfn) = tempfile.mkstemp(prefix="hg-editor-", |
36837
472c68cda3f8
py3: wrap file object to write patch in native eol preserving byte-ness
Yuya Nishihara <yuya@tcha.org>
parents:
36835
diff
changeset
|
1108 suffix=".diff") |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1109 ncpatchfp = None |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1110 try: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1111 # Write the initial patch |
36837
472c68cda3f8
py3: wrap file object to write patch in native eol preserving byte-ness
Yuya Nishihara <yuya@tcha.org>
parents:
36835
diff
changeset
|
1112 f = util.nativeeolwriter(os.fdopen(patchfd, r'wb')) |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1113 chunk.header.write(f) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1114 chunk.write(f) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1115 f.write('\n'.join(['# ' + i for i in phelp.splitlines()])) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1116 f.close() |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1117 # Start the editor and wait for it to complete |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1118 editor = ui.geteditor() |
25483
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25424
diff
changeset
|
1119 ret = ui.system("%s \"%s\"" % (editor, patchfn), |
31198
71a6723c0029
patch: set a blockedtag when running an external filter
Simon Farnsworth <simonfar@fb.com>
parents:
30924
diff
changeset
|
1120 environ={'HGUSER': ui.username()}, |
71a6723c0029
patch: set a blockedtag when running an external filter
Simon Farnsworth <simonfar@fb.com>
parents:
30924
diff
changeset
|
1121 blockedtag='filterpatch') |
25483
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25424
diff
changeset
|
1122 if ret != 0: |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25424
diff
changeset
|
1123 ui.warn(_("editor exited with exit code %d\n") % ret) |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25424
diff
changeset
|
1124 continue |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1125 # Remove comment lines |
36838
c268ba15deb3
py3: open patch file in binary mode and convert eol manually
Yuya Nishihara <yuya@tcha.org>
parents:
36837
diff
changeset
|
1126 patchfp = open(patchfn, r'rb') |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
1127 ncpatchfp = stringio() |
30397 | 1128 for line in util.iterfile(patchfp): |
36838
c268ba15deb3
py3: open patch file in binary mode and convert eol manually
Yuya Nishihara <yuya@tcha.org>
parents:
36837
diff
changeset
|
1129 line = util.fromnativeeol(line) |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1130 if not line.startswith('#'): |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1131 ncpatchfp.write(line) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1132 patchfp.close() |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1133 ncpatchfp.seek(0) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1134 newpatches = parsepatch(ncpatchfp) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1135 finally: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1136 os.unlink(patchfn) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1137 del ncpatchfp |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1138 # Signal that the chunk shouldn't be applied as-is, but |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1139 # provide the new patch to be used instead. |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1140 ret = False |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1141 elif r == 3: # Skip |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1142 ret = skipfile = False |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1143 elif r == 4: # file (Record remaining) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1144 ret = skipfile = True |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1145 elif r == 5: # done, skip remaining |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1146 ret = skipall = False |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1147 elif r == 6: # all |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1148 ret = skipall = True |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1149 elif r == 7: # quit |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26560
diff
changeset
|
1150 raise error.Abort(_('user quit')) |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1151 return ret, skipfile, skipall, newpatches |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1152 |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1153 seen = set() |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1154 applied = {} # 'filename' -> [] of chunks |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1155 skipfile, skipall = None, None |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1156 pos, total = 1, sum(len(h.hunks) for h in headers) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1157 for h in headers: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1158 pos += len(h.hunks) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1159 skipfile = None |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1160 fixoffset = 0 |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1161 hdr = ''.join(h.header) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1162 if hdr in seen: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1163 continue |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1164 seen.add(hdr) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1165 if skipall is None: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1166 h.pretty(ui) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1167 msg = (_('examine changes to %s?') % |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1168 _(' and ').join("'%s'" % f for f in h.files())) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1169 r, skipfile, skipall, np = prompt(skipfile, skipall, msg, None) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1170 if not r: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1171 continue |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1172 applied[h.filename()] = [h] |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1173 if h.allhunks(): |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1174 applied[h.filename()] += h.hunks |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1175 continue |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1176 for i, chunk in enumerate(h.hunks): |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1177 if skipfile is None and skipall is None: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1178 chunk.pretty(ui) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1179 if total == 1: |
34042
c0170d88ed2b
patch: take messages out of the function so that extensions can add entries
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34013
diff
changeset
|
1180 msg = messages['single'][operation] % chunk.filename() |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1181 else: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1182 idx = pos - len(h.hunks) + i |
34042
c0170d88ed2b
patch: take messages out of the function so that extensions can add entries
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34013
diff
changeset
|
1183 msg = messages['multiple'][operation] % (idx, total, |
c0170d88ed2b
patch: take messages out of the function so that extensions can add entries
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34013
diff
changeset
|
1184 chunk.filename()) |
24269
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1185 r, skipfile, skipall, newpatches = prompt(skipfile, |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1186 skipall, msg, chunk) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1187 if r: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1188 if fixoffset: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1189 chunk = copy.copy(chunk) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1190 chunk.toline += fixoffset |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1191 applied[chunk.filename()].append(chunk) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1192 elif newpatches is not None: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1193 for newpatch in newpatches: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1194 for newhunk in newpatch.hunks: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1195 if fixoffset: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1196 newhunk.toline += fixoffset |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1197 applied[newhunk.filename()].append(newhunk) |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1198 else: |
9a745ced79a9
record: move filterpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24268
diff
changeset
|
1199 fixoffset += chunk.removed - chunk.added |
27155
8d3c5797a175
commit: add a way to return more information from the chunkselector
Laurent Charignon <lcharignon@fb.com>
parents:
26781
diff
changeset
|
1200 return (sum([h for h in applied.itervalues() |
8d3c5797a175
commit: add a way to return more information from the chunkselector
Laurent Charignon <lcharignon@fb.com>
parents:
26781
diff
changeset
|
1201 if h[0].special() or len(h) > 1], []), {}) |
8778
c5f36402daad
use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8761
diff
changeset
|
1202 class hunk(object): |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1203 def __init__(self, desc, num, lr, context): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1204 self.number = num |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1205 self.desc = desc |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
1206 self.hunk = [desc] |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1207 self.a = [] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1208 self.b = [] |
9682
bd70f645cfb0
patch: initialize all attributes of the hunk class
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9681
diff
changeset
|
1209 self.starta = self.lena = None |
bd70f645cfb0
patch: initialize all attributes of the hunk class
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9681
diff
changeset
|
1210 self.startb = self.lenb = None |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1211 if lr is not None: |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1212 if context: |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1213 self.read_context_hunk(lr) |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1214 else: |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1215 self.read_unified_hunk(lr) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1216 |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1217 def getnormalized(self): |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1218 """Return a copy with line endings normalized to LF.""" |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1219 |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1220 def normalize(lines): |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1221 nlines = [] |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1222 for line in lines: |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1223 if line.endswith('\r\n'): |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1224 line = line[:-2] + '\n' |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1225 nlines.append(line) |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1226 return nlines |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1227 |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1228 # Dummy object, it is rebuilt manually |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1229 nh = hunk(self.desc, self.number, None, None) |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1230 nh.number = self.number |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1231 nh.desc = self.desc |
10524
3212afb33116
patch: fix patching with fuzz and eol normalization
Patrick Mezard <pmezard@gmail.com>
parents:
10518
diff
changeset
|
1232 nh.hunk = self.hunk |
10127
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1233 nh.a = normalize(self.a) |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1234 nh.b = normalize(self.b) |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1235 nh.starta = self.starta |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1236 nh.startb = self.startb |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1237 nh.lena = self.lena |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1238 nh.lenb = self.lenb |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1239 return nh |
d8214e944b84
patch: fix eolmode=auto with new files
Patrick Mezard <pmezard@gmail.com>
parents:
10102
diff
changeset
|
1240 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1241 def read_unified_hunk(self, lr): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1242 m = unidesc.match(self.desc) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1243 if not m: |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1244 raise PatchError(_("bad hunk #%d") % self.number) |
15510
5414b56cfad6
patch: simplify hunk extents parsing
Patrick Mezard <pmezard@gmail.com>
parents:
15462
diff
changeset
|
1245 self.starta, self.lena, self.startb, self.lenb = m.groups() |
8527
f9a80054dd3c
use 'x is None' instead of 'x == None'
Martin Geisler <mg@lazybytes.net>
parents:
8526
diff
changeset
|
1246 if self.lena is None: |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1247 self.lena = 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1248 else: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1249 self.lena = int(self.lena) |
8527
f9a80054dd3c
use 'x is None' instead of 'x == None'
Martin Geisler <mg@lazybytes.net>
parents:
8526
diff
changeset
|
1250 if self.lenb is None: |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1251 self.lenb = 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1252 else: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1253 self.lenb = int(self.lenb) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1254 self.starta = int(self.starta) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1255 self.startb = int(self.startb) |
37573
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37571
diff
changeset
|
1256 try: |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37571
diff
changeset
|
1257 diffhelpers.addlines(lr, self.hunk, self.lena, self.lenb, |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37571
diff
changeset
|
1258 self.a, self.b) |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37571
diff
changeset
|
1259 except error.ParseError as e: |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37571
diff
changeset
|
1260 raise PatchError(_("bad hunk #%d: %s") % (self.number, e)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1261 # if we hit eof before finishing out the hunk, the last line will |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1262 # be zero length. Lets try to fix it up. |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1263 while len(self.hunk[-1]) == 0: |
6948
359e93ceee3a
fix double indentation and trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6884
diff
changeset
|
1264 del self.hunk[-1] |
359e93ceee3a
fix double indentation and trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6884
diff
changeset
|
1265 del self.a[-1] |
359e93ceee3a
fix double indentation and trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6884
diff
changeset
|
1266 del self.b[-1] |
359e93ceee3a
fix double indentation and trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6884
diff
changeset
|
1267 self.lena -= 1 |
359e93ceee3a
fix double indentation and trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6884
diff
changeset
|
1268 self.lenb -= 1 |
13699
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1269 self._fixnewline(lr) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1270 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1271 def read_context_hunk(self, lr): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1272 self.desc = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1273 m = contextdesc.match(self.desc) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1274 if not m: |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1275 raise PatchError(_("bad hunk #%d") % self.number) |
15510
5414b56cfad6
patch: simplify hunk extents parsing
Patrick Mezard <pmezard@gmail.com>
parents:
15462
diff
changeset
|
1276 self.starta, aend = m.groups() |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1277 self.starta = int(self.starta) |
8527
f9a80054dd3c
use 'x is None' instead of 'x == None'
Martin Geisler <mg@lazybytes.net>
parents:
8526
diff
changeset
|
1278 if aend is None: |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1279 aend = self.starta |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1280 self.lena = int(aend) - self.starta |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1281 if self.starta: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1282 self.lena += 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1283 for x in xrange(self.lena): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1284 l = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1285 if l.startswith('---'): |
12825
61f48581d8ef
Test applying context diffs
Patrick Mezard <pmezard@gmail.com>
parents:
12728
diff
changeset
|
1286 # lines addition, old block is empty |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1287 lr.push(l) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1288 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1289 s = l[2:] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1290 if l.startswith('- ') or l.startswith('! '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1291 u = '-' + s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1292 elif l.startswith(' '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1293 u = ' ' + s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1294 else: |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1295 raise PatchError(_("bad hunk #%d old text line %d") % |
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1296 (self.number, x)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1297 self.a.append(u) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1298 self.hunk.append(u) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1299 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1300 l = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1301 if l.startswith('\ '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1302 s = self.a[-1][:-1] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1303 self.a[-1] = s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1304 self.hunk[-1] = s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1305 l = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1306 m = contextdesc.match(l) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1307 if not m: |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1308 raise PatchError(_("bad hunk #%d") % self.number) |
15510
5414b56cfad6
patch: simplify hunk extents parsing
Patrick Mezard <pmezard@gmail.com>
parents:
15462
diff
changeset
|
1309 self.startb, bend = m.groups() |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1310 self.startb = int(self.startb) |
8527
f9a80054dd3c
use 'x is None' instead of 'x == None'
Martin Geisler <mg@lazybytes.net>
parents:
8526
diff
changeset
|
1311 if bend is None: |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1312 bend = self.startb |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1313 self.lenb = int(bend) - self.startb |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1314 if self.startb: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1315 self.lenb += 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1316 hunki = 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1317 for x in xrange(self.lenb): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1318 l = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1319 if l.startswith('\ '): |
12825
61f48581d8ef
Test applying context diffs
Patrick Mezard <pmezard@gmail.com>
parents:
12728
diff
changeset
|
1320 # XXX: the only way to hit this is with an invalid line range. |
61f48581d8ef
Test applying context diffs
Patrick Mezard <pmezard@gmail.com>
parents:
12728
diff
changeset
|
1321 # The no-eol marker is not counted in the line range, but I |
61f48581d8ef
Test applying context diffs
Patrick Mezard <pmezard@gmail.com>
parents:
12728
diff
changeset
|
1322 # guess there are diff(1) out there which behave differently. |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1323 s = self.b[-1][:-1] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1324 self.b[-1] = s |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
1325 self.hunk[hunki - 1] = s |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1326 continue |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1327 if not l: |
12825
61f48581d8ef
Test applying context diffs
Patrick Mezard <pmezard@gmail.com>
parents:
12728
diff
changeset
|
1328 # line deletions, new block is empty and we hit EOF |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1329 lr.push(l) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1330 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1331 s = l[2:] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1332 if l.startswith('+ ') or l.startswith('! '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1333 u = '+' + s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1334 elif l.startswith(' '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1335 u = ' ' + s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1336 elif len(self.b) == 0: |
12825
61f48581d8ef
Test applying context diffs
Patrick Mezard <pmezard@gmail.com>
parents:
12728
diff
changeset
|
1337 # line deletions, new block is empty |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1338 lr.push(l) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1339 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1340 else: |
4898
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1341 raise PatchError(_("bad hunk #%d old text line %d") % |
bc905a6c0e76
patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com>
parents:
4897
diff
changeset
|
1342 (self.number, x)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1343 self.b.append(s) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1344 while True: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1345 if hunki >= len(self.hunk): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1346 h = "" |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1347 else: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1348 h = self.hunk[hunki] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1349 hunki += 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1350 if h == u: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1351 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1352 elif h.startswith('-'): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1353 continue |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1354 else: |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
1355 self.hunk.insert(hunki - 1, u) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1356 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1357 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1358 if not self.a: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1359 # this happens when lines were only added to the hunk |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1360 for x in self.hunk: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1361 if x.startswith('-') or x.startswith(' '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1362 self.a.append(x) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1363 if not self.b: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1364 # this happens when lines were only deleted from the hunk |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1365 for x in self.hunk: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1366 if x.startswith('+') or x.startswith(' '): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1367 self.b.append(x[1:]) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1368 # @@ -start,len +start,len @@ |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1369 self.desc = "@@ -%d,%d +%d,%d @@\n" % (self.starta, self.lena, |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1370 self.startb, self.lenb) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1371 self.hunk[0] = self.desc |
13699
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1372 self._fixnewline(lr) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1373 |
13699
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1374 def _fixnewline(self, lr): |
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1375 l = lr.readline() |
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1376 if l.startswith('\ '): |
37570
c4c8d0d1267f
diffhelpers: naming and whitespace cleanup
Yuya Nishihara <yuya@tcha.org>
parents:
37568
diff
changeset
|
1377 diffhelpers.fixnewline(self.hunk, self.a, self.b) |
13699
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1378 else: |
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1379 lr.push(l) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1380 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1381 def complete(self): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1382 return len(self.a) == self.lena and len(self.b) == self.lenb |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1383 |
16121
ccba74472af2
patch: fuzz old and new lines at the same time
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1384 def _fuzzit(self, old, new, fuzz, toponly): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1385 # this removes context lines from the top and bottom of list 'l'. It |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1386 # checks the hunk to make sure only context lines are removed, and then |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1387 # returns a new shortened list of lines. |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1388 fuzz = min(fuzz, len(old)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1389 if fuzz: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1390 top = 0 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1391 bot = 0 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1392 hlen = len(self.hunk) |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
1393 for x in xrange(hlen - 1): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1394 # the hunk starts with the @@ line, so use x+1 |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1395 if self.hunk[x + 1].startswith(' '): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1396 top += 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1397 else: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1398 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1399 if not toponly: |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
1400 for x in xrange(hlen - 1): |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1401 if self.hunk[hlen - bot - 1].startswith(' '): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1402 bot += 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1403 else: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1404 break |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1405 |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1406 bot = min(fuzz, bot) |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1407 top = min(fuzz, top) |
18054
b35e3364f94a
check-code: there must also be whitespace between ')' and operator
Mads Kiilerich <madski@unity3d.com>
parents:
17968
diff
changeset
|
1408 return old[top:len(old) - bot], new[top:len(new) - bot], top |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1409 return old, new, 0 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1410 |
16121
ccba74472af2
patch: fuzz old and new lines at the same time
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1411 def fuzzit(self, fuzz, toponly): |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1412 old, new, top = self._fuzzit(self.a, self.b, fuzz, toponly) |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1413 oldstart = self.starta + top |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1414 newstart = self.startb + top |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1415 # zero length hunk ranges already have their start decremented |
16650
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16524
diff
changeset
|
1416 if self.lena and oldstart > 0: |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1417 oldstart -= 1 |
16650
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16524
diff
changeset
|
1418 if self.lenb and newstart > 0: |
16122
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1419 newstart -= 1 |
9ef3a4a2c6c0
patch: make hunk.fuzzit() compute the fuzzed start locations
Patrick Mezard <patrick@mezard.eu>
parents:
16121
diff
changeset
|
1420 return old, oldstart, new, newstart |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1421 |
14764
a7d5816087a9
classes: fix class style problems found by b071cd58af50
Thomas Arendsen Hein <thomas@intevation.de>
parents:
14695
diff
changeset
|
1422 class binhunk(object): |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1423 'A binary patch file.' |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
1424 def __init__(self, lr, fname): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1425 self.text = None |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1426 self.delta = False |
9585
ea1935e2020a
patch: handle symlinks without symlinkhunk
Patrick Mezard <pmezard@gmail.com>
parents:
9573
diff
changeset
|
1427 self.hunk = ['GIT binary patch\n'] |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
1428 self._fname = fname |
14384
9d59c596eb9e
patch: construct and parse binary hunks at the same time
Patrick Mezard <pmezard@gmail.com>
parents:
14383
diff
changeset
|
1429 self._read(lr) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1430 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1431 def complete(self): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1432 return self.text is not None |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1433 |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1434 def new(self, lines): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1435 if self.delta: |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1436 return [applybindelta(self.text, ''.join(lines))] |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1437 return [self.text] |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1438 |
14384
9d59c596eb9e
patch: construct and parse binary hunks at the same time
Patrick Mezard <pmezard@gmail.com>
parents:
14383
diff
changeset
|
1439 def _read(self, lr): |
16524
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1440 def getline(lr, hunk): |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1441 l = lr.readline() |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1442 hunk.append(l) |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1443 return l.rstrip('\r\n') |
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1444 |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1445 size = 0 |
16567
aef3d0d4631c
patch: clarify binary hunk parsing loop
Patrick Mezard <patrick@mezard.eu>
parents:
16524
diff
changeset
|
1446 while True: |
16524
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1447 line = getline(lr, self.hunk) |
16567
aef3d0d4631c
patch: clarify binary hunk parsing loop
Patrick Mezard <patrick@mezard.eu>
parents:
16524
diff
changeset
|
1448 if not line: |
aef3d0d4631c
patch: clarify binary hunk parsing loop
Patrick Mezard <patrick@mezard.eu>
parents:
16524
diff
changeset
|
1449 raise PatchError(_('could not extract "%s" binary data') |
aef3d0d4631c
patch: clarify binary hunk parsing loop
Patrick Mezard <patrick@mezard.eu>
parents:
16524
diff
changeset
|
1450 % self._fname) |
aef3d0d4631c
patch: clarify binary hunk parsing loop
Patrick Mezard <patrick@mezard.eu>
parents:
16524
diff
changeset
|
1451 if line.startswith('literal '): |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1452 size = int(line[8:].rstrip()) |
16567
aef3d0d4631c
patch: clarify binary hunk parsing loop
Patrick Mezard <patrick@mezard.eu>
parents:
16524
diff
changeset
|
1453 break |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1454 if line.startswith('delta '): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1455 size = int(line[6:].rstrip()) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1456 self.delta = True |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1457 break |
3367
7f486971d263
Add git-1.4 binary patch support
Brendan Cully <brendan@kublai.com>
parents:
3329
diff
changeset
|
1458 dec = [] |
16524
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1459 line = getline(lr, self.hunk) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1460 while len(line) > 1: |
36192
eb91ffdaaece
py3: slice over bytes to prevent getting ascii values
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36046
diff
changeset
|
1461 l = line[0:1] |
3374
fd43ff3b4442
Use line length field when extracting git binary patches
Brendan Cully <brendan@kublai.com>
parents:
3367
diff
changeset
|
1462 if l <= 'Z' and l >= 'A': |
fd43ff3b4442
Use line length field when extracting git binary patches
Brendan Cully <brendan@kublai.com>
parents:
3367
diff
changeset
|
1463 l = ord(l) - ord('A') + 1 |
fd43ff3b4442
Use line length field when extracting git binary patches
Brendan Cully <brendan@kublai.com>
parents:
3367
diff
changeset
|
1464 else: |
fd43ff3b4442
Use line length field when extracting git binary patches
Brendan Cully <brendan@kublai.com>
parents:
3367
diff
changeset
|
1465 l = ord(l) - ord('a') + 27 |
16522
a8065323c003
patch: display a nice error for invalid base85 data
Patrick Mezard <patrick@mezard.eu>
parents:
16506
diff
changeset
|
1466 try: |
32201
4462a981e8df
base85: proxy through util module
Yuya Nishihara <yuya@tcha.org>
parents:
32191
diff
changeset
|
1467 dec.append(util.b85decode(line[1:])[:l]) |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25658
diff
changeset
|
1468 except ValueError as e: |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
1469 raise PatchError(_('could not decode "%s" binary patch: %s') |
37084
f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36838
diff
changeset
|
1470 % (self._fname, stringutil.forcebytestr(e))) |
16524
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1471 line = getline(lr, self.hunk) |
3367
7f486971d263
Add git-1.4 binary patch support
Brendan Cully <brendan@kublai.com>
parents:
3329
diff
changeset
|
1472 text = zlib.decompress(''.join(dec)) |
7f486971d263
Add git-1.4 binary patch support
Brendan Cully <brendan@kublai.com>
parents:
3329
diff
changeset
|
1473 if len(text) != size: |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
1474 raise PatchError(_('"%s" length is %d bytes, should be %d') |
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
1475 % (self._fname, len(text), size)) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1476 self.text = text |
3367
7f486971d263
Add git-1.4 binary patch support
Brendan Cully <brendan@kublai.com>
parents:
3329
diff
changeset
|
1477 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1478 def parsefilename(str): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1479 # --- filename \t|space stuff |
5851
03f550f9b554
patch: remove CRLF when parsing file names
Patrick Mezard <pmezard@gmail.com>
parents:
5669
diff
changeset
|
1480 s = str[4:].rstrip('\r\n') |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1481 i = s.find('\t') |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1482 if i < 0: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1483 i = s.find(' ') |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1484 if i < 0: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1485 return s |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1486 return s[:i] |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1487 |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1488 def reversehunks(hunks): |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1489 '''reverse the signs in the hunks given as argument |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1490 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1491 This function operates on hunks coming out of patch.filterpatch, that is |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1492 a list of the form: [header1, hunk1, hunk2, header2...]. Example usage: |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1493 |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1494 >>> rawpatch = b"""diff --git a/folder1/g b/folder1/g |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1495 ... --- a/folder1/g |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1496 ... +++ b/folder1/g |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1497 ... @@ -1,7 +1,7 @@ |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1498 ... +firstline |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1499 ... c |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1500 ... 1 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1501 ... 2 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1502 ... + 3 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1503 ... -4 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1504 ... 5 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1505 ... d |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1506 ... +lastline""" |
34253
5ce32fe7df34
py3: fix doctests in patch.py to be compatible with Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34252
diff
changeset
|
1507 >>> hunks = parsepatch([rawpatch]) |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1508 >>> hunkscomingfromfilterpatch = [] |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1509 >>> for h in hunks: |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1510 ... hunkscomingfromfilterpatch.append(h) |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1511 ... hunkscomingfromfilterpatch.extend(h.hunks) |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1512 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1513 >>> reversedhunks = reversehunks(hunkscomingfromfilterpatch) |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
1514 >>> from . import util |
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
1515 >>> fp = util.stringio() |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1516 >>> for c in reversedhunks: |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1517 ... c.write(fp) |
34253
5ce32fe7df34
py3: fix doctests in patch.py to be compatible with Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34252
diff
changeset
|
1518 >>> fp.seek(0) or None |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1519 >>> reversedpatch = fp.read() |
34137
a8994d08e4a2
doctest: use print_function and convert bytes to unicode where needed
Yuya Nishihara <yuya@tcha.org>
parents:
34131
diff
changeset
|
1520 >>> print(pycompat.sysstr(reversedpatch)) |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1521 diff --git a/folder1/g b/folder1/g |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1522 --- a/folder1/g |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1523 +++ b/folder1/g |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1524 @@ -1,4 +1,3 @@ |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1525 -firstline |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1526 c |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1527 1 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1528 2 |
32979
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
1529 @@ -2,6 +1,6 @@ |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1530 c |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1531 1 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1532 2 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1533 - 3 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1534 +4 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1535 5 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1536 d |
32979
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
1537 @@ -6,3 +5,2 @@ |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1538 5 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1539 d |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1540 -lastline |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1541 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1542 ''' |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1543 |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1544 newhunks = [] |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1545 for c in hunks: |
32979
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
1546 if util.safehasattr(c, 'reversehunk'): |
66117dae87f9
patch: rewrite reversehunks (issue5337)
Jun Wu <quark@fb.com>
parents:
32370
diff
changeset
|
1547 c = c.reversehunk() |
25424
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1548 newhunks.append(c) |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1549 return newhunks |
69609f43c752
revert: add an experimental config to use inverted selection
Laurent Charignon <lcharignon@fb.com>
parents:
25359
diff
changeset
|
1550 |
33270
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1551 def parsepatch(originalchunks, maxcontext=None): |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1552 """patch -> [] of headers -> [] of hunks |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1553 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1554 If maxcontext is not None, trim context lines if necessary. |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1555 |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1556 >>> rawpatch = b'''diff --git a/folder1/g b/folder1/g |
33270
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1557 ... --- a/folder1/g |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1558 ... +++ b/folder1/g |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1559 ... @@ -1,8 +1,10 @@ |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1560 ... 1 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1561 ... 2 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1562 ... -3 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1563 ... 4 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1564 ... 5 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1565 ... 6 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1566 ... +6.1 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1567 ... +6.2 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1568 ... 7 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1569 ... 8 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1570 ... +9''' |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1571 >>> out = util.stringio() |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1572 >>> headers = parsepatch([rawpatch], maxcontext=1) |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1573 >>> for header in headers: |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1574 ... header.write(out) |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1575 ... for hunk in header.hunks: |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1576 ... hunk.write(out) |
34137
a8994d08e4a2
doctest: use print_function and convert bytes to unicode where needed
Yuya Nishihara <yuya@tcha.org>
parents:
34131
diff
changeset
|
1577 >>> print(pycompat.sysstr(out.getvalue())) |
33270
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1578 diff --git a/folder1/g b/folder1/g |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1579 --- a/folder1/g |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1580 +++ b/folder1/g |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1581 @@ -2,3 +2,2 @@ |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1582 2 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1583 -3 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1584 4 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1585 @@ -6,2 +5,4 @@ |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1586 6 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1587 +6.1 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1588 +6.2 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1589 7 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1590 @@ -8,1 +9,2 @@ |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1591 8 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1592 +9 |
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1593 """ |
24265
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1594 class parser(object): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1595 """patch parsing state machine""" |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1596 def __init__(self): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1597 self.fromline = 0 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1598 self.toline = 0 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1599 self.proc = '' |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1600 self.header = None |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1601 self.context = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1602 self.before = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1603 self.hunk = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1604 self.headers = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1605 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1606 def addrange(self, limits): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1607 fromstart, fromend, tostart, toend, proc = limits |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1608 self.fromline = int(fromstart) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1609 self.toline = int(tostart) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1610 self.proc = proc |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1611 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1612 def addcontext(self, context): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1613 if self.hunk: |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1614 h = recordhunk(self.header, self.fromline, self.toline, |
33270
f7b635716ef2
patch: make parsepatch optionally trim context lines
Jun Wu <quark@fb.com>
parents:
33229
diff
changeset
|
1615 self.proc, self.before, self.hunk, context, maxcontext) |
24265
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1616 self.header.hunks.append(h) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1617 self.fromline += len(self.before) + h.removed |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1618 self.toline += len(self.before) + h.added |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1619 self.before = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1620 self.hunk = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1621 self.context = context |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1622 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1623 def addhunk(self, hunk): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1624 if self.context: |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1625 self.before = self.context |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1626 self.context = [] |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1627 self.hunk = hunk |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1628 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1629 def newfile(self, hdr): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1630 self.addcontext([]) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1631 h = header(hdr) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1632 self.headers.append(h) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1633 self.header = h |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1634 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1635 def addother(self, line): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1636 pass # 'other' lines are ignored |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1637 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1638 def finished(self): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1639 self.addcontext([]) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1640 return self.headers |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1641 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1642 transitions = { |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1643 'file': {'context': addcontext, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1644 'file': newfile, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1645 'hunk': addhunk, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1646 'range': addrange}, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1647 'context': {'file': newfile, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1648 'hunk': addhunk, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1649 'range': addrange, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1650 'other': addother}, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1651 'hunk': {'context': addcontext, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1652 'file': newfile, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1653 'range': addrange}, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1654 'range': {'context': addcontext, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1655 'hunk': addhunk}, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1656 'other': {'other': addother}, |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1657 } |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1658 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1659 p = parser() |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
1660 fp = stringio() |
24341
616c01b69898
record: change interface of the filtering function
Laurent Charignon <lcharignon@fb.com>
parents:
24306
diff
changeset
|
1661 fp.write(''.join(originalchunks)) |
616c01b69898
record: change interface of the filtering function
Laurent Charignon <lcharignon@fb.com>
parents:
24306
diff
changeset
|
1662 fp.seek(0) |
24265
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1663 |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1664 state = 'context' |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1665 for newstate, data in scanpatch(fp): |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1666 try: |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1667 p.transitions[state][newstate](p, data) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1668 except KeyError: |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1669 raise PatchError('unhandled transition: %s -> %s' % |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1670 (state, newstate)) |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1671 state = newstate |
24341
616c01b69898
record: change interface of the filtering function
Laurent Charignon <lcharignon@fb.com>
parents:
24306
diff
changeset
|
1672 del fp |
24265
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1673 return p.finished() |
dc655360bccb
record: move parsepatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24264
diff
changeset
|
1674 |
24244
5918bb365c72
patch.pathtransform: add a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24243
diff
changeset
|
1675 def pathtransform(path, strip, prefix): |
24243
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1676 '''turn a path from a patch into a path suitable for the repository |
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1677 |
24244
5918bb365c72
patch.pathtransform: add a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24243
diff
changeset
|
1678 prefix, if not empty, is expected to be normalized with a / at the end. |
5918bb365c72
patch.pathtransform: add a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24243
diff
changeset
|
1679 |
24243
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1680 Returns (stripped components, path in repository). |
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1681 |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1682 >>> pathtransform(b'a/b/c', 0, b'') |
24243
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1683 ('', 'a/b/c') |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1684 >>> pathtransform(b' a/b/c ', 0, b'') |
24243
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1685 ('', ' a/b/c') |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1686 >>> pathtransform(b' a/b/c ', 2, b'') |
24243
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1687 ('a/b/', 'c') |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1688 >>> pathtransform(b'a/b/c', 0, b'd/e/') |
24385
885a573fa619
patch.pathtransform: prepend prefix even if strip is 0
Siddharth Agarwal <sid0@fb.com>
parents:
24371
diff
changeset
|
1689 ('', 'd/e/a/b/c') |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1690 >>> pathtransform(b' a//b/c ', 2, b'd/e/') |
24244
5918bb365c72
patch.pathtransform: add a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24243
diff
changeset
|
1691 ('a//b/', 'd/e/c') |
34131
0fa781320203
doctest: bulk-replace string literals with b'' for Python 3
Yuya Nishihara <yuya@tcha.org>
parents:
34067
diff
changeset
|
1692 >>> pathtransform(b'a/b/c', 3, b'') |
24243
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1693 Traceback (most recent call last): |
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1694 PatchError: unable to strip away 1 of 3 dirs from a/b/c |
daee2039dd11
patch.pathtransform: add doctests
Siddharth Agarwal <sid0@fb.com>
parents:
24242
diff
changeset
|
1695 ''' |
11022
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1696 pathlen = len(path) |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1697 i = 0 |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1698 if strip == 0: |
24385
885a573fa619
patch.pathtransform: prepend prefix even if strip is 0
Siddharth Agarwal <sid0@fb.com>
parents:
24371
diff
changeset
|
1699 return '', prefix + path.rstrip() |
11022
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1700 count = strip |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1701 while count > 0: |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1702 i = path.find('/', i) |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1703 if i == -1: |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1704 raise PatchError(_("unable to strip away %d of %d dirs from %s") % |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1705 (count, strip, path)) |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1706 i += 1 |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1707 # consume '//' in the path |
34067
8b8b70cb4288
py3: replace bytes[n] with bytes[n:n + 1] in patch.py where needed
Yuya Nishihara <yuya@tcha.org>
parents:
34066
diff
changeset
|
1708 while i < pathlen - 1 and path[i:i + 1] == '/': |
11022
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1709 i += 1 |
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1710 count -= 1 |
24244
5918bb365c72
patch.pathtransform: add a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24243
diff
changeset
|
1711 return path[:i].lstrip(), prefix + path[i:].rstrip() |
11022
0429d0d49f92
patch: strip paths in leaked git patchmeta objects
Mads Kiilerich <mads@kiilerich.com>
parents:
11021
diff
changeset
|
1712 |
24245
740a17f885a1
patch.makepatchmeta: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24244
diff
changeset
|
1713 def makepatchmeta(backend, afile_orig, bfile_orig, hunk, strip, prefix): |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1714 nulla = afile_orig == "/dev/null" |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1715 nullb = bfile_orig == "/dev/null" |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1716 create = nulla and hunk.starta == 0 and hunk.lena == 0 |
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1717 remove = nullb and hunk.startb == 0 and hunk.lenb == 0 |
24245
740a17f885a1
patch.makepatchmeta: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24244
diff
changeset
|
1718 abase, afile = pathtransform(afile_orig, strip, prefix) |
14351
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
1719 gooda = not nulla and backend.exists(afile) |
24245
740a17f885a1
patch.makepatchmeta: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24244
diff
changeset
|
1720 bbase, bfile = pathtransform(bfile_orig, strip, prefix) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1721 if afile == bfile: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1722 goodb = gooda |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1723 else: |
14351
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
1724 goodb = not nullb and backend.exists(bfile) |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1725 missing = not goodb and not gooda and not create |
9328
648d6a1a1cf2
patch: create file even if source is not /dev/null
Brendan Cully <brendan@kublai.com>
parents:
9248
diff
changeset
|
1726 |
11820
75de514a50f3
patch: fix typo in comment
Martin Geisler <mg@aragost.com>
parents:
11645
diff
changeset
|
1727 # some diff programs apparently produce patches where the afile is |
75de514a50f3
patch: fix typo in comment
Martin Geisler <mg@aragost.com>
parents:
11645
diff
changeset
|
1728 # not /dev/null, but afile starts with bfile |
10745
d94832c4a31d
patch: try harder to find the file to patch on file creation (issue2041)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10736
diff
changeset
|
1729 abasedir = afile[:afile.rfind('/') + 1] |
d94832c4a31d
patch: try harder to find the file to patch on file creation (issue2041)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10736
diff
changeset
|
1730 bbasedir = bfile[:bfile.rfind('/') + 1] |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1731 if (missing and abasedir == bbasedir and afile.startswith(bfile) |
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1732 and hunk.starta == 0 and hunk.lena == 0): |
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1733 create = True |
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1734 missing = False |
9328
648d6a1a1cf2
patch: create file even if source is not /dev/null
Brendan Cully <brendan@kublai.com>
parents:
9248
diff
changeset
|
1735 |
6295
bace1990ab12
patch: fix corner case with update + copy patch handling (issue 937)
Patrick Mezard <pmezard@gmail.com>
parents:
6280
diff
changeset
|
1736 # If afile is "a/b/foo" and bfile is "a/b/foo.orig" we assume the |
bace1990ab12
patch: fix corner case with update + copy patch handling (issue 937)
Patrick Mezard <pmezard@gmail.com>
parents:
6280
diff
changeset
|
1737 # diff is between a file and its backup. In this case, the original |
bace1990ab12
patch: fix corner case with update + copy patch handling (issue 937)
Patrick Mezard <pmezard@gmail.com>
parents:
6280
diff
changeset
|
1738 # file should be patched (see original mpatch code). |
bace1990ab12
patch: fix corner case with update + copy patch handling (issue 937)
Patrick Mezard <pmezard@gmail.com>
parents:
6280
diff
changeset
|
1739 isbackup = (abase == bbase and bfile.startswith(afile)) |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1740 fname = None |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1741 if not missing: |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1742 if gooda and goodb: |
24306
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1743 if isbackup: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1744 fname = afile |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1745 else: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1746 fname = bfile |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1747 elif gooda: |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1748 fname = afile |
5760
0145f9afb0e7
Removed tabs and trailing whitespace in python files
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5706
diff
changeset
|
1749 |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1750 if not fname: |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1751 if not nullb: |
24306
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1752 if isbackup: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1753 fname = afile |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1754 else: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
1755 fname = bfile |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1756 elif not nulla: |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1757 fname = afile |
5652
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1758 else: |
e90e72c6b4c7
patch: write rej files for missing targets (issue 853)
Patrick Mezard <pmezard@gmail.com>
parents:
5651
diff
changeset
|
1759 raise PatchError(_("undefined source and destination files")) |
5760
0145f9afb0e7
Removed tabs and trailing whitespace in python files
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5706
diff
changeset
|
1760 |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1761 gp = patchmeta(fname) |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1762 if create: |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1763 gp.op = 'ADD' |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1764 elif remove: |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1765 gp.op = 'DELETE' |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1766 return gp |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1767 |
24264
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1768 def scanpatch(fp): |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1769 """like patch.iterhunks, but yield different events |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1770 |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1771 - ('file', [header_lines + fromfile + tofile]) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1772 - ('context', [context_lines]) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1773 - ('hunk', [hunk_lines]) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1774 - ('range', (-start,len, +start,len, proc)) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1775 """ |
34066
871a58b5f428
py3: fix type of regex literals in patch.py
Yuya Nishihara <yuya@tcha.org>
parents:
34042
diff
changeset
|
1776 lines_re = re.compile(br'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
24264
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1777 lr = linereader(fp) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1778 |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1779 def scanwhile(first, p): |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1780 """scan lr while predicate holds""" |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1781 lines = [first] |
29726
160c829dd5d0
patch: use `iter(callable, sentinel)` instead of while True
Augie Fackler <augie@google.com>
parents:
29422
diff
changeset
|
1782 for line in iter(lr.readline, ''): |
24264
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1783 if p(line): |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1784 lines.append(line) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1785 else: |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1786 lr.push(line) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1787 break |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1788 return lines |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1789 |
29726
160c829dd5d0
patch: use `iter(callable, sentinel)` instead of while True
Augie Fackler <augie@google.com>
parents:
29422
diff
changeset
|
1790 for line in iter(lr.readline, ''): |
24264
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1791 if line.startswith('diff --git a/') or line.startswith('diff -r '): |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1792 def notheader(line): |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1793 s = line.split(None, 1) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1794 return not s or s[0] not in ('---', 'diff') |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1795 header = scanwhile(line, notheader) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1796 fromfile = lr.readline() |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1797 if fromfile.startswith('---'): |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1798 tofile = lr.readline() |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1799 header += [fromfile, tofile] |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1800 else: |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1801 lr.push(fromfile) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1802 yield 'file', header |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1803 elif line.startswith(' '): |
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1804 cs = (' ', '\\') |
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1805 yield 'context', scanwhile(line, lambda l: l.startswith(cs)) |
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1806 elif line.startswith(('-', '+')): |
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1807 cs = ('-', '+', '\\') |
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
1808 yield 'hunk', scanwhile(line, lambda l: l.startswith(cs)) |
24264
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1809 else: |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1810 m = lines_re.match(line) |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1811 if m: |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1812 yield 'range', m.groups() |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1813 else: |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1814 yield 'other', line |
c4205452f1b7
record: move scanpatch from record to patch
Laurent Charignon <lcharignon@fb.com>
parents:
24263
diff
changeset
|
1815 |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1816 def scangitpatch(lr, firstline): |
7186
f77c8d8331ca
clean up trailing spaces, leading spaces in C
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7153
diff
changeset
|
1817 """ |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1818 Git patches can emit: |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1819 - rename a to b |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1820 - change b |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1821 - copy a to c |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1822 - change c |
7186
f77c8d8331ca
clean up trailing spaces, leading spaces in C
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7153
diff
changeset
|
1823 |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1824 We cannot apply this sequence as-is, the renamed 'a' could not be |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1825 found for it would have been renamed already. And we cannot copy |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1826 from 'b' instead because 'b' would have been changed already. So |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1827 we scan the git patch for copy and rename commands so we can |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1828 perform the copies ahead of time. |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1829 """ |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1830 pos = 0 |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1831 try: |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1832 pos = lr.fp.tell() |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1833 fp = lr.fp |
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1834 except IOError: |
28861
86db5cb55d46
pycompat: switch to util.stringio for py3 compat
timeless <timeless@mozdev.org>
parents:
28341
diff
changeset
|
1835 fp = stringio(lr.fp.read()) |
14418
0174d1f79280
patch: remove EOL support from linereader class
Patrick Mezard <pmezard@gmail.com>
parents:
14402
diff
changeset
|
1836 gitlr = linereader(fp) |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1837 gitlr.push(firstline) |
12669
b0fa39c68370
patch: remove unused flags from readgitpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
12645
diff
changeset
|
1838 gitpatches = readgitpatch(gitlr) |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1839 fp.seek(pos) |
12669
b0fa39c68370
patch: remove unused flags from readgitpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
12645
diff
changeset
|
1840 return gitpatches |
7152
f0055cec8446
patch: pass linereader to scangitpatch(), extract from iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
7151
diff
changeset
|
1841 |
14240
28762bb767dc
patch: remove unused ui arg to iterhunks
Idan Kamara <idankk86@gmail.com>
parents:
14234
diff
changeset
|
1842 def iterhunks(fp): |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1843 """Read a patch and yield the following events: |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1844 - ("file", afile, bfile, firsthunk): select a new target file. |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1845 - ("hunk", hunk): a new hunk is ready to be applied, follows a |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1846 "file" event. |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1847 - ("git", gitchanges): current diff is in git format, gitchanges |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1848 maps filenames to gitpatch records. Unique event. |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1849 """ |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1850 afile = "" |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1851 bfile = "" |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1852 state = None |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1853 hunknum = 0 |
14017
19a7b48446e3
patch: remove redundant variable in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13971
diff
changeset
|
1854 emitfile = newfile = False |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
1855 gitpatches = None |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1856 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1857 # our states |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1858 BFILE = 1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1859 context = None |
10128
ea7c392f2b08
patch: drop eol normalization fast-path for 'lf' and 'crlf'
Patrick Mezard <pmezard@gmail.com>
parents:
10127
diff
changeset
|
1860 lr = linereader(fp) |
2861
0f08f2c042ec
Move patch-related code into its own module.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1861 |
29726
160c829dd5d0
patch: use `iter(callable, sentinel)` instead of while True
Augie Fackler <augie@google.com>
parents:
29422
diff
changeset
|
1862 for x in iter(lr.readline, ''): |
14383
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1863 if state == BFILE and ( |
36646
463df2986814
py3: fix slicing of bytes in patch.iterhunks()
Yuya Nishihara <yuya@tcha.org>
parents:
36607
diff
changeset
|
1864 (not context and x.startswith('@')) |
14383
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1865 or (context is not False and x.startswith('***************')) |
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1866 or x.startswith('GIT binary patch')): |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
1867 gp = None |
14534
ecc79816d31e
patch: fix patchmeta/hunk synchronization in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
14533
diff
changeset
|
1868 if (gitpatches and |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1869 gitpatches[-1].ispatching(afile, bfile)): |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1870 gp = gitpatches.pop() |
14383
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1871 if x.startswith('GIT binary patch'): |
16523
727068417b95
patch: include file name in binary patch error messages
Patrick Mezard <patrick@mezard.eu>
parents:
16522
diff
changeset
|
1872 h = binhunk(lr, gp.path) |
14383
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1873 else: |
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1874 if context is None and x.startswith('***************'): |
1bd52cb12a55
patch: refactor iterhunks() regular and binary files emission
Patrick Mezard <pmezard@gmail.com>
parents:
14382
diff
changeset
|
1875 context = True |
14451
c78d41db6f88
patch: refactor file creation/removal detection
Patrick Mezard <pmezard@gmail.com>
parents:
14437
diff
changeset
|
1876 h = hunk(x, hunknum + 1, lr, context) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1877 hunknum += 1 |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1878 if emitfile: |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1879 emitfile = False |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1880 yield 'file', (afile, bfile, h, gp and gp.copy() or None) |
13699
d3c0e0033f13
patch: fix hunk newlines when parsing hunks, not in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13395
diff
changeset
|
1881 yield 'hunk', h |
18830
6b827d84d286
patch: match 'diff --git a/' instead of 'diff --git'
Sean Farley <sean.michael.farley@gmail.com>
parents:
18824
diff
changeset
|
1882 elif x.startswith('diff --git a/'): |
16524
ed6a74312176
patch: be more tolerant with EOLs in binary diffs (issue2870)
Patrick Mezard <patrick@mezard.eu>
parents:
16523
diff
changeset
|
1883 m = gitre.match(x.rstrip(' \r\n')) |
14387 | 1884 if not m: |
1885 continue | |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1886 if gitpatches is None: |
14387 | 1887 # scan whole input for git metadata |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1888 gitpatches = scangitpatch(lr, x) |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1889 yield 'git', [g.copy() for g in gitpatches |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1890 if g.op in ('COPY', 'RENAME')] |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
1891 gitpatches.reverse() |
14387 | 1892 afile = 'a/' + m.group(1) |
1893 bfile = 'b/' + m.group(2) | |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1894 while gitpatches and not gitpatches[-1].ispatching(afile, bfile): |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1895 gp = gitpatches.pop() |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1896 yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy()) |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1897 if not gitpatches: |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1898 raise PatchError(_('failed to synchronize metadata for "%s"') |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1899 % afile[2:]) |
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1900 gp = gitpatches[-1] |
14387 | 1901 newfile = True |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1902 elif x.startswith('---'): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1903 # check for a unified diff |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1904 l2 = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1905 if not l2.startswith('+++'): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1906 lr.push(l2) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1907 continue |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1908 newfile = True |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1909 context = False |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1910 afile = parsefilename(x) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1911 bfile = parsefilename(l2) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1912 elif x.startswith('***'): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1913 # check for a context diff |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1914 l2 = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1915 if not l2.startswith('---'): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1916 lr.push(l2) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1917 continue |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1918 l3 = lr.readline() |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1919 lr.push(l3) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1920 if not l3.startswith("***************"): |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1921 lr.push(l2) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1922 continue |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1923 newfile = True |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1924 context = True |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1925 afile = parsefilename(x) |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1926 bfile = parsefilename(l2) |
3057
d16b93f4a6ca
unlink temporary patch files even when an exception is raised
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3056
diff
changeset
|
1927 |
14017
19a7b48446e3
patch: remove redundant variable in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13971
diff
changeset
|
1928 if newfile: |
19a7b48446e3
patch: remove redundant variable in iterhunks()
Patrick Mezard <pmezard@gmail.com>
parents:
13971
diff
changeset
|
1929 newfile = False |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1930 emitfile = True |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1931 state = BFILE |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
1932 hunknum = 0 |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1933 |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
1934 while gitpatches: |
16506
fc4e0fecf403
patch: fix patch hunk/metdata synchronization (issue3384)
Patrick Mezard <patrick@mezard.eu>
parents:
16475
diff
changeset
|
1935 gp = gitpatches.pop() |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
1936 yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy()) |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
1937 |
20137
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1938 def applybindelta(binchunk, data): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1939 """Apply a binary delta hunk |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1940 The algorithm used is the algorithm from git's patch-delta.c |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1941 """ |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1942 def deltahead(binchunk): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1943 i = 0 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1944 for c in binchunk: |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1945 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1946 if not (ord(c) & 0x80): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1947 return i |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1948 return i |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1949 out = "" |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1950 s = deltahead(binchunk) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1951 binchunk = binchunk[s:] |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1952 s = deltahead(binchunk) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1953 binchunk = binchunk[s:] |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1954 i = 0 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1955 while i < len(binchunk): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1956 cmd = ord(binchunk[i]) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1957 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1958 if (cmd & 0x80): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1959 offset = 0 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1960 size = 0 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1961 if (cmd & 0x01): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1962 offset = ord(binchunk[i]) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1963 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1964 if (cmd & 0x02): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1965 offset |= ord(binchunk[i]) << 8 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1966 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1967 if (cmd & 0x04): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1968 offset |= ord(binchunk[i]) << 16 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1969 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1970 if (cmd & 0x08): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1971 offset |= ord(binchunk[i]) << 24 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1972 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1973 if (cmd & 0x10): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1974 size = ord(binchunk[i]) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1975 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1976 if (cmd & 0x20): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1977 size |= ord(binchunk[i]) << 8 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1978 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1979 if (cmd & 0x40): |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1980 size |= ord(binchunk[i]) << 16 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1981 i += 1 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1982 if size == 0: |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1983 size = 0x10000 |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1984 offset_end = offset + size |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1985 out += data[offset:offset_end] |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1986 elif cmd != 0: |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1987 offset_end = i + cmd |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1988 out += binchunk[i:offset_end] |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1989 i += cmd |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1990 else: |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1991 raise PatchError(_('unexpected delta opcode 0')) |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1992 return out |
9f1d4323c749
patch: add support for git delta hunks
Nicolas Vigier <boklm@mars-attacks.org>
parents:
20035
diff
changeset
|
1993 |
24247
6e19516094a3
patch.applydiff: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24246
diff
changeset
|
1994 def applydiff(ui, fp, backend, store, strip=1, prefix='', eolmode='strict'): |
10966
91c58cf54eee
patch: refactor applydiff to allow for mempatching
Augie Fackler <durin42@gmail.com>
parents:
10965
diff
changeset
|
1995 """Reads a patch from fp and tries to apply it. |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
1996 |
14565
3cacc232f27f
patch: stop updating changed files set in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14564
diff
changeset
|
1997 Returns 0 for a clean patch, -1 if any rejects were found and 1 if |
3cacc232f27f
patch: stop updating changed files set in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14564
diff
changeset
|
1998 there was any fuzz. |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
1999 |
10101
155fe35534d3
patch: propagate eolmode down to patchfile
Martin Geisler <mg@lazybytes.net>
parents:
9725
diff
changeset
|
2000 If 'eolmode' is 'strict', the patch content and patched file are |
155fe35534d3
patch: propagate eolmode down to patchfile
Martin Geisler <mg@lazybytes.net>
parents:
9725
diff
changeset
|
2001 read in binary mode. Otherwise, line endings are ignored when |
155fe35534d3
patch: propagate eolmode down to patchfile
Martin Geisler <mg@lazybytes.net>
parents:
9725
diff
changeset
|
2002 patching then normalized according to 'eolmode'. |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2003 """ |
14565
3cacc232f27f
patch: stop updating changed files set in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14564
diff
changeset
|
2004 return _applydiff(ui, fp, patchfile, backend, store, strip=strip, |
24247
6e19516094a3
patch.applydiff: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24246
diff
changeset
|
2005 prefix=prefix, eolmode=eolmode) |
10966
91c58cf54eee
patch: refactor applydiff to allow for mempatching
Augie Fackler <durin42@gmail.com>
parents:
10965
diff
changeset
|
2006 |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2007 def _canonprefix(repo, prefix): |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2008 if prefix: |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2009 prefix = pathutil.canonpath(repo.root, repo.getcwd(), prefix) |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2010 if prefix != '': |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2011 prefix += '/' |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2012 return prefix |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2013 |
24246
394a91cb3d4a
patch._applydiff: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24245
diff
changeset
|
2014 def _applydiff(ui, fp, patcher, backend, store, strip=1, prefix='', |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
2015 eolmode='strict'): |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2016 prefix = _canonprefix(backend.repo, prefix) |
14389
909ac6b9636b
patch: stop modifying gitpatch objects
Patrick Mezard <pmezard@gmail.com>
parents:
14388
diff
changeset
|
2017 def pstrip(p): |
24246
394a91cb3d4a
patch._applydiff: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24245
diff
changeset
|
2018 return pathtransform(p, strip - 1, prefix)[1] |
14389
909ac6b9636b
patch: stop modifying gitpatch objects
Patrick Mezard <pmezard@gmail.com>
parents:
14388
diff
changeset
|
2019 |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2020 rejects = 0 |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2021 err = 0 |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2022 current_file = None |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2023 |
14240
28762bb767dc
patch: remove unused ui arg to iterhunks
Idan Kamara <idankk86@gmail.com>
parents:
14234
diff
changeset
|
2024 for state, values in iterhunks(fp): |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2025 if state == 'hunk': |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2026 if not current_file: |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2027 continue |
11021
c47a1cfad572
patch: minor cleanup of _applydiff
Mads Kiilerich <mads@kiilerich.com>
parents:
11020
diff
changeset
|
2028 ret = current_file.apply(values) |
14565
3cacc232f27f
patch: stop updating changed files set in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14564
diff
changeset
|
2029 if ret > 0: |
3cacc232f27f
patch: stop updating changed files set in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14564
diff
changeset
|
2030 err = 1 |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2031 elif state == 'file': |
13701
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
2032 if current_file: |
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
2033 rejects += current_file.close() |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2034 current_file = None |
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2035 afile, bfile, first_hunk, gp = values |
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2036 if gp: |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2037 gp.path = pstrip(gp.path) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
2038 if gp.oldpath: |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2039 gp.oldpath = pstrip(gp.oldpath) |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2040 else: |
24246
394a91cb3d4a
patch._applydiff: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24245
diff
changeset
|
2041 gp = makepatchmeta(backend, afile, bfile, first_hunk, strip, |
394a91cb3d4a
patch._applydiff: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24245
diff
changeset
|
2042 prefix) |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2043 if gp.op == 'RENAME': |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2044 backend.unlink(gp.oldpath) |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2045 if not first_hunk: |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2046 if gp.op == 'DELETE': |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2047 backend.unlink(gp.path) |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2048 continue |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2049 data, mode = None, None |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2050 if gp.op in ('RENAME', 'COPY'): |
14609
f53dc0787424
patch: extend filtestore to store an optional copy source
Patrick Mezard <pmezard@gmail.com>
parents:
14566
diff
changeset
|
2051 data, mode = store.getfile(gp.oldpath)[:2] |
30078
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29948
diff
changeset
|
2052 if data is None: |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29948
diff
changeset
|
2053 # This means that the old path does not exist |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29948
diff
changeset
|
2054 raise PatchError(_("source file '%s' does not exist") |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29948
diff
changeset
|
2055 % gp.oldpath) |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2056 if gp.mode: |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2057 mode = gp.mode |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2058 if gp.op == 'ADD': |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2059 # Added files without content have no hunk and |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2060 # must be created |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2061 data = '' |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2062 if data or mode: |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2063 if (gp.op in ('ADD', 'RENAME', 'COPY') |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2064 and backend.exists(gp.path)): |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2065 raise PatchError(_("cannot create %s: destination " |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2066 "already exists") % gp.path) |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2067 backend.setfile(gp.path, data, mode, gp.oldpath) |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2068 continue |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2069 try: |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2070 current_file = patcher(ui, gp, backend, store, |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2071 eolmode=eolmode) |
25660
328739ea70c3
global: mass rewrite to use modern exception syntax
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25658
diff
changeset
|
2072 except PatchError as inst: |
14218
202ff575d49b
patch: fix clash between local variable and exception instance
Martin Geisler <mg@aragost.com>
parents:
14217
diff
changeset
|
2073 ui.warn(str(inst) + '\n') |
11021
c47a1cfad572
patch: minor cleanup of _applydiff
Mads Kiilerich <mads@kiilerich.com>
parents:
11020
diff
changeset
|
2074 current_file = None |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2075 rejects += 1 |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2076 continue |
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2077 elif state == 'git': |
11021
c47a1cfad572
patch: minor cleanup of _applydiff
Mads Kiilerich <mads@kiilerich.com>
parents:
11020
diff
changeset
|
2078 for gp in values: |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
2079 path = pstrip(gp.oldpath) |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
2080 data, mode = backend.getfile(path) |
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
2081 if data is None: |
16813
6d42c797ca6e
patch: keep patching after missing copy source (issue3480)
Patrick Mezard <patrick@mezard.eu>
parents:
16650
diff
changeset
|
2082 # The error ignored here will trigger a getfile() |
6d42c797ca6e
patch: keep patching after missing copy source (issue3480)
Patrick Mezard <patrick@mezard.eu>
parents:
16650
diff
changeset
|
2083 # error in a place more appropriate for error |
6d42c797ca6e
patch: keep patching after missing copy source (issue3480)
Patrick Mezard <patrick@mezard.eu>
parents:
16650
diff
changeset
|
2084 # handling, and will not interrupt the patching |
6d42c797ca6e
patch: keep patching after missing copy source (issue3480)
Patrick Mezard <patrick@mezard.eu>
parents:
16650
diff
changeset
|
2085 # process. |
22296
650b5b6e75ed
convert: use None value for missing files instead of overloading IOError
Mads Kiilerich <madski@unity3d.com>
parents:
21833
diff
changeset
|
2086 pass |
16813
6d42c797ca6e
patch: keep patching after missing copy source (issue3480)
Patrick Mezard <patrick@mezard.eu>
parents:
16650
diff
changeset
|
2087 else: |
6d42c797ca6e
patch: keep patching after missing copy source (issue3480)
Patrick Mezard <patrick@mezard.eu>
parents:
16650
diff
changeset
|
2088 store.setfile(path, data, mode) |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
2089 else: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26560
diff
changeset
|
2090 raise error.Abort(_('unsupported parser state: %s') % state) |
5649
a583117b536a
patch: move NoHunk detection up with parsing code
Patrick Mezard <pmezard@gmail.com>
parents:
5581
diff
changeset
|
2091 |
13701
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
2092 if current_file: |
bc38ff7cb919
patch: move closefile() into patchfile.close()
Patrick Mezard <pmezard@gmail.com>
parents:
13700
diff
changeset
|
2093 rejects += current_file.close() |
5650
5d3e2f918d65
patch: move diff parsing in iterhunks generator
Patrick Mezard <pmezard@gmail.com>
parents:
5649
diff
changeset
|
2094 |
4897
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
2095 if rejects: |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
2096 return -1 |
4574925db5c0
Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4778
diff
changeset
|
2097 return err |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2098 |
14382
2d16f15da7bd
patch: remove patch.patch() cwd argument
Patrick Mezard <pmezard@gmail.com>
parents:
14381
diff
changeset
|
2099 def _externalpatch(ui, repo, patcher, patchname, strip, files, |
14381
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2100 similarity): |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2101 """use <patcher> to apply <patchname> to the working directory. |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2102 returns whether patch was applied with fuzz factor.""" |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2103 |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2104 fuzz = False |
12673
9ad16d1bce4b
patch: simplify externalpatch() arguments
Patrick Mezard <pmezard@gmail.com>
parents:
12671
diff
changeset
|
2105 args = [] |
14382
2d16f15da7bd
patch: remove patch.patch() cwd argument
Patrick Mezard <pmezard@gmail.com>
parents:
14381
diff
changeset
|
2106 cwd = repo.root |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2107 if cwd: |
37120
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
37084
diff
changeset
|
2108 args.append('-d %s' % procutil.shellquote(cwd)) |
37458
00e4bd97b095
procutil: always popen() in binary mode
Yuya Nishihara <yuya@tcha.org>
parents:
37456
diff
changeset
|
2109 cmd = ('%s %s -p%d < %s' |
00e4bd97b095
procutil: always popen() in binary mode
Yuya Nishihara <yuya@tcha.org>
parents:
37456
diff
changeset
|
2110 % (patcher, ' '.join(args), strip, procutil.shellquote(patchname))) |
00e4bd97b095
procutil: always popen() in binary mode
Yuya Nishihara <yuya@tcha.org>
parents:
37456
diff
changeset
|
2111 fp = procutil.popen(cmd, 'rb') |
14381
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2112 try: |
30397 | 2113 for line in util.iterfile(fp): |
14381
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2114 line = line.rstrip() |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2115 ui.note(line + '\n') |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2116 if line.startswith('patching file '): |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2117 pf = util.parsepatchoutput(line) |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2118 printed_file = False |
14564
65f4512e40e4
patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com>
parents:
14535
diff
changeset
|
2119 files.add(pf) |
14381
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2120 elif line.find('with fuzz') >= 0: |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2121 fuzz = True |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2122 if not printed_file: |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2123 ui.warn(pf + '\n') |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2124 printed_file = True |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2125 ui.warn(line + '\n') |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2126 elif line.find('saving rejects to file') >= 0: |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2127 ui.warn(line + '\n') |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2128 elif line.find('FAILED') >= 0: |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2129 if not printed_file: |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2130 ui.warn(pf + '\n') |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2131 printed_file = True |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2132 ui.warn(line + '\n') |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2133 finally: |
d4192500586a
patch: merge _updatedir() into externalpatch()
Patrick Mezard <pmezard@gmail.com>
parents:
14370
diff
changeset
|
2134 if files: |
19155
0b3689a08df5
patch: use scmutil.marktouched instead of scmutil.addremove
Siddharth Agarwal <sid0@fb.com>
parents:
18830
diff
changeset
|
2135 scmutil.marktouched(repo, files, similarity) |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2136 code = fp.close() |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2137 if code: |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2138 raise PatchError(_("patch command failed: %s") % |
37463
bbd240f81ac5
procutil: make explainexit() simply return a message (API)
Yuya Nishihara <yuya@tcha.org>
parents:
37458
diff
changeset
|
2139 procutil.explainexit(code)) |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2140 return fuzz |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2141 |
24253
26fa5ff9e660
patch.patchbackend: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24247
diff
changeset
|
2142 def patchbackend(ui, backend, patchobj, strip, prefix, files=None, |
26fa5ff9e660
patch.patchbackend: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24247
diff
changeset
|
2143 eolmode='strict'): |
9683
5c8651e2f5e0
patch: don't use mutable object as default argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9682
diff
changeset
|
2144 if files is None: |
14564
65f4512e40e4
patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com>
parents:
14535
diff
changeset
|
2145 files = set() |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2146 if eolmode is None: |
33229
dd50a370c8cb
configitems: register the 'patch.eol' config
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
33156
diff
changeset
|
2147 eolmode = ui.config('patch', 'eol') |
10101
155fe35534d3
patch: propagate eolmode down to patchfile
Martin Geisler <mg@lazybytes.net>
parents:
9725
diff
changeset
|
2148 if eolmode.lower() not in eolmodes: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26560
diff
changeset
|
2149 raise error.Abort(_('unsupported line endings type: %s') % eolmode) |
10101
155fe35534d3
patch: propagate eolmode down to patchfile
Martin Geisler <mg@lazybytes.net>
parents:
9725
diff
changeset
|
2150 eolmode = eolmode.lower() |
8843
eb7b247a98ea
kill trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8817
diff
changeset
|
2151 |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
2152 store = filestore() |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2153 try: |
9031
3b76321aa0de
compat: use open() instead of file() everywhere
Alejandro Santos <alejolp@alejolp.com>
parents:
9029
diff
changeset
|
2154 fp = open(patchobj, 'rb') |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2155 except TypeError: |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2156 fp = patchobj |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2157 try: |
24253
26fa5ff9e660
patch.patchbackend: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24247
diff
changeset
|
2158 ret = applydiff(ui, fp, backend, store, strip=strip, prefix=prefix, |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
2159 eolmode=eolmode) |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2160 finally: |
10203
6e26e3c2083f
patch: explicitely close input patch files when leaving
Patrick Mezard <pmezard@gmail.com>
parents:
10135
diff
changeset
|
2161 if fp != patchobj: |
6e26e3c2083f
patch: explicitely close input patch files when leaving
Patrick Mezard <pmezard@gmail.com>
parents:
10135
diff
changeset
|
2162 fp.close() |
14564
65f4512e40e4
patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com>
parents:
14535
diff
changeset
|
2163 files.update(backend.close()) |
14452
ee574cfd0c32
patch: use temporary files to handle intermediate copies
Patrick Mezard <pmezard@gmail.com>
parents:
14451
diff
changeset
|
2164 store.close() |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2165 if ret < 0: |
12674
aa2fe1f52ff4
patch: always raise PatchError with a message, simplify handling
Patrick Mezard <pmezard@gmail.com>
parents:
12673
diff
changeset
|
2166 raise PatchError(_('patch failed to apply')) |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2167 return ret > 0 |
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2168 |
24268
cf7d252d8c30
patch.internalpatch: add a default value for prefix
Siddharth Agarwal <sid0@fb.com>
parents:
24265
diff
changeset
|
2169 def internalpatch(ui, repo, patchobj, strip, prefix='', files=None, |
24254
60c279ab7bd3
patch.internalpatch: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24253
diff
changeset
|
2170 eolmode='strict', similarity=0): |
14611
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2171 """use builtin patch to apply <patchobj> to the working directory. |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2172 returns whether patch was applied with fuzz factor.""" |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2173 backend = workingbackend(ui, repo, similarity) |
24254
60c279ab7bd3
patch.internalpatch: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24253
diff
changeset
|
2174 return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) |
14611
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2175 |
24260
76225ab5a5da
cmdutil.tryimportone: allow importing relative patches with --bypass
Siddharth Agarwal <sid0@fb.com>
parents:
24259
diff
changeset
|
2176 def patchrepo(ui, repo, ctx, store, patchobj, strip, prefix, files=None, |
14611
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2177 eolmode='strict'): |
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2178 backend = repobackend(ui, repo, ctx, store) |
24260
76225ab5a5da
cmdutil.tryimportone: allow importing relative patches with --bypass
Siddharth Agarwal <sid0@fb.com>
parents:
24259
diff
changeset
|
2179 return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode) |
14611
adbf5e7df96d
import: add --bypass option
Patrick Mezard <pmezard@gmail.com>
parents:
14609
diff
changeset
|
2180 |
24259
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
24254
diff
changeset
|
2181 def patch(ui, repo, patchname, strip=1, prefix='', files=None, eolmode='strict', |
14260
00a881581400
patch: make patch()/internalpatch() always update the dirstate
Patrick Mezard <pmezard@gmail.com>
parents:
14259
diff
changeset
|
2182 similarity=0): |
8810
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2183 """Apply <patchname> to the working directory. |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2184 |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2185 'eolmode' specifies how end of lines should be handled. It can be: |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2186 - 'strict': inputs are read in binary mode, EOLs are preserved |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2187 - 'crlf': EOLs are ignored when patching and reset to CRLF |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2188 - 'lf': EOLs are ignored when patching and reset to LF |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2189 - None: get it from user settings, default to 'strict' |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2190 'eolmode' is ignored when using an external patcher program. |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2191 |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2192 Returns whether patch was applied with fuzz factor. |
ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com>
parents:
8778
diff
changeset
|
2193 """ |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2194 patcher = ui.config('ui', 'patch') |
9683
5c8651e2f5e0
patch: don't use mutable object as default argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9682
diff
changeset
|
2195 if files is None: |
14564
65f4512e40e4
patch: turn patch() touched files dict into a set
Patrick Mezard <pmezard@gmail.com>
parents:
14535
diff
changeset
|
2196 files = set() |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20972
diff
changeset
|
2197 if patcher: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20972
diff
changeset
|
2198 return _externalpatch(ui, repo, patcher, patchname, strip, |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20972
diff
changeset
|
2199 files, similarity) |
24259
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
24254
diff
changeset
|
2200 return internalpatch(ui, repo, patchname, strip, prefix, files, eolmode, |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20972
diff
changeset
|
2201 similarity) |
7151
b5bc5293021c
patch: change functions definition order for readability
Patrick Mezard <pmezard@gmail.com>
parents:
7150
diff
changeset
|
2202 |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2203 def changedfiles(ui, repo, patchpath, strip=1, prefix=''): |
14351
d54f9bbcc640
patch: add lexists() to backends, use it in selectfile()
Patrick Mezard <pmezard@gmail.com>
parents:
14350
diff
changeset
|
2204 backend = fsbackend(ui, repo.root) |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2205 prefix = _canonprefix(repo, prefix) |
27796
f7f3958d39c0
with: use context manager for I/O in changedfiles in patch
Bryan O'Sullivan <bryano@fb.com>
parents:
27485
diff
changeset
|
2206 with open(patchpath, 'rb') as fp: |
14255
576256a81cb6
patch: introduce changedfiles
Idan Kamara <idankk86@gmail.com>
parents:
14240
diff
changeset
|
2207 changed = set() |
576256a81cb6
patch: introduce changedfiles
Idan Kamara <idankk86@gmail.com>
parents:
14240
diff
changeset
|
2208 for state, values in iterhunks(fp): |
14389
909ac6b9636b
patch: stop modifying gitpatch objects
Patrick Mezard <pmezard@gmail.com>
parents:
14388
diff
changeset
|
2209 if state == 'file': |
14388
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2210 afile, bfile, first_hunk, gp = values |
37c997d21752
patch: stop handling hunkless git blocks out of stream
Patrick Mezard <pmezard@gmail.com>
parents:
14387
diff
changeset
|
2211 if gp: |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2212 gp.path = pathtransform(gp.path, strip - 1, prefix)[1] |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2213 if gp.oldpath: |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2214 gp.oldpath = pathtransform(gp.oldpath, strip - 1, |
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2215 prefix)[1] |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2216 else: |
24245
740a17f885a1
patch.makepatchmeta: accept a prefix parameter
Siddharth Agarwal <sid0@fb.com>
parents:
24244
diff
changeset
|
2217 gp = makepatchmeta(backend, afile, bfile, first_hunk, strip, |
35062
1706eae096e2
patch: accept prefix argument to changedfiles() helper
Martin von Zweigbergk <martinvonz@google.com>
parents:
34968
diff
changeset
|
2218 prefix) |
14566
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2219 changed.add(gp.path) |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2220 if gp.op == 'RENAME': |
d0c2cc11e611
patch: generalize the use of patchmeta in applydiff()
Patrick Mezard <pmezard@gmail.com>
parents:
14565
diff
changeset
|
2221 changed.add(gp.oldpath) |
14389
909ac6b9636b
patch: stop modifying gitpatch objects
Patrick Mezard <pmezard@gmail.com>
parents:
14388
diff
changeset
|
2222 elif state not in ('hunk', 'git'): |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26560
diff
changeset
|
2223 raise error.Abort(_('unsupported parser state: %s') % state) |
14255
576256a81cb6
patch: introduce changedfiles
Idan Kamara <idankk86@gmail.com>
parents:
14240
diff
changeset
|
2224 return changed |
576256a81cb6
patch: introduce changedfiles
Idan Kamara <idankk86@gmail.com>
parents:
14240
diff
changeset
|
2225 |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2226 class GitDiffRequired(Exception): |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2227 pass |
7198
df79ee9b6278
patch: extract local function addmodehdr
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7186
diff
changeset
|
2228 |
23431
10223d2278f4
patch: rename diffopts to diffallopts
Siddharth Agarwal <sid0@fb.com>
parents:
23430
diff
changeset
|
2229 def diffallopts(ui, opts=None, untrusted=False, section='diff'): |
23430
3821be85fd4d
patch: add a new function to initialize diffopts by feature
Siddharth Agarwal <sid0@fb.com>
parents:
23429
diff
changeset
|
2230 '''return diffopts with all features supported and parsed''' |
23433
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2231 return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section, |
23434
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2232 git=True, whitespace=True, formatchanging=True) |
23430
3821be85fd4d
patch: add a new function to initialize diffopts by feature
Siddharth Agarwal <sid0@fb.com>
parents:
23429
diff
changeset
|
2233 |
23431
10223d2278f4
patch: rename diffopts to diffallopts
Siddharth Agarwal <sid0@fb.com>
parents:
23430
diff
changeset
|
2234 diffopts = diffallopts |
10223d2278f4
patch: rename diffopts to diffallopts
Siddharth Agarwal <sid0@fb.com>
parents:
23430
diff
changeset
|
2235 |
23433
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2236 def difffeatureopts(ui, opts=None, untrusted=False, section='diff', git=False, |
23434
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2237 whitespace=False, formatchanging=False): |
23432
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2238 '''return diffopts with only opted-in features parsed |
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2239 |
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2240 Features: |
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2241 - git: git-style diffs |
23433
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2242 - whitespace: whitespace options like ignoreblanklines and ignorews |
23434
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2243 - formatchanging: options that will likely break or cause correctness issues |
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2244 with most diff parsers |
23432
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2245 ''' |
23295
ac072c79bd9d
patch.diffopts: break get function into if statements
Siddharth Agarwal <sid0@fb.com>
parents:
22460
diff
changeset
|
2246 def get(key, name=None, getter=ui.configbool, forceplain=None): |
ac072c79bd9d
patch.diffopts: break get function into if statements
Siddharth Agarwal <sid0@fb.com>
parents:
22460
diff
changeset
|
2247 if opts: |
ac072c79bd9d
patch.diffopts: break get function into if statements
Siddharth Agarwal <sid0@fb.com>
parents:
22460
diff
changeset
|
2248 v = opts.get(key) |
29948
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2249 # diffopts flags are either None-default (which is passed |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2250 # through unchanged, so we can identify unset values), or |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2251 # some other falsey default (eg --unified, which defaults |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2252 # to an empty string). We only want to override the config |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2253 # entries from hgrc with command line values if they |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2254 # appear to have been set, which is any truthy value, |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2255 # True, or False. |
e40343ce9c4c
diffopts: notice a negated boolean flag in diffopts
Augie Fackler <augie@google.com>
parents:
29900
diff
changeset
|
2256 if v or isinstance(v, bool): |
23295
ac072c79bd9d
patch.diffopts: break get function into if statements
Siddharth Agarwal <sid0@fb.com>
parents:
22460
diff
changeset
|
2257 return v |
23296
922fcfb02e77
patch.diffopts: allow a setting to be forced in plain mode
Siddharth Agarwal <sid0@fb.com>
parents:
23295
diff
changeset
|
2258 if forceplain is not None and ui.plain(): |
922fcfb02e77
patch.diffopts: allow a setting to be forced in plain mode
Siddharth Agarwal <sid0@fb.com>
parents:
23295
diff
changeset
|
2259 return forceplain |
34521
aacb17cc0ee4
configitems: register the 'diff.*' config
Boris Feld <boris.feld@octobus.net>
parents:
34380
diff
changeset
|
2260 return getter(section, name or key, untrusted=untrusted) |
23295
ac072c79bd9d
patch.diffopts: break get function into if statements
Siddharth Agarwal <sid0@fb.com>
parents:
22460
diff
changeset
|
2261 |
23434
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2262 # core options, expected to be understood by every diff parser |
23429
f35526b999f4
patch.diffopts: use a dict for initialization
Siddharth Agarwal <sid0@fb.com>
parents:
23300
diff
changeset
|
2263 buildopts = { |
f35526b999f4
patch.diffopts: use a dict for initialization
Siddharth Agarwal <sid0@fb.com>
parents:
23300
diff
changeset
|
2264 'nodates': get('nodates'), |
f35526b999f4
patch.diffopts: use a dict for initialization
Siddharth Agarwal <sid0@fb.com>
parents:
23300
diff
changeset
|
2265 'showfunc': get('show_function', 'showfunc'), |
f35526b999f4
patch.diffopts: use a dict for initialization
Siddharth Agarwal <sid0@fb.com>
parents:
23300
diff
changeset
|
2266 'context': get('unified', getter=ui.config), |
f35526b999f4
patch.diffopts: use a dict for initialization
Siddharth Agarwal <sid0@fb.com>
parents:
23300
diff
changeset
|
2267 } |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2268 buildopts['worddiff'] = ui.configbool('experimental', 'worddiff') |
36676
c6a61298ac32
mdiff: add a config option to use xdiff algorithm
Jun Wu <quark@fb.com>
parents:
36646
diff
changeset
|
2269 buildopts['xdiff'] = ui.configbool('experimental', 'xdiff') |
23429
f35526b999f4
patch.diffopts: use a dict for initialization
Siddharth Agarwal <sid0@fb.com>
parents:
23300
diff
changeset
|
2270 |
23432
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2271 if git: |
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2272 buildopts['git'] = get('git') |
30788
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2273 |
30806
e2796f193f06
patch: add similarity config knob in experimental section
Sean Farley <sean@farley.io>
parents:
30790
diff
changeset
|
2274 # since this is in the experimental section, we need to call |
e2796f193f06
patch: add similarity config knob in experimental section
Sean Farley <sean@farley.io>
parents:
30790
diff
changeset
|
2275 # ui.configbool directory |
e2796f193f06
patch: add similarity config knob in experimental section
Sean Farley <sean@farley.io>
parents:
30790
diff
changeset
|
2276 buildopts['showsimilarity'] = ui.configbool('experimental', |
e2796f193f06
patch: add similarity config knob in experimental section
Sean Farley <sean@farley.io>
parents:
30790
diff
changeset
|
2277 'extendedheader.similarity') |
e2796f193f06
patch: add similarity config knob in experimental section
Sean Farley <sean@farley.io>
parents:
30790
diff
changeset
|
2278 |
30788
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2279 # need to inspect the ui object instead of using get() since we want to |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2280 # test for an int |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2281 hconf = ui.config('experimental', 'extendedheader.index') |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2282 if hconf is not None: |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2283 hlen = None |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2284 try: |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2285 # the hash config could be an integer (for length of hash) or a |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2286 # word (e.g. short, full, none) |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2287 hlen = int(hconf) |
30819
897726622877
patch: check length of git index header only if integer is specified
Yuya Nishihara <yuya@tcha.org>
parents:
30808
diff
changeset
|
2288 if hlen < 0 or hlen > 40: |
897726622877
patch: check length of git index header only if integer is specified
Yuya Nishihara <yuya@tcha.org>
parents:
30808
diff
changeset
|
2289 msg = _("invalid length for extendedheader.index: '%d'\n") |
897726622877
patch: check length of git index header only if integer is specified
Yuya Nishihara <yuya@tcha.org>
parents:
30808
diff
changeset
|
2290 ui.warn(msg % hlen) |
30788
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2291 except ValueError: |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2292 # default value |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2293 if hconf == 'short' or hconf == '': |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2294 hlen = 12 |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2295 elif hconf == 'full': |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2296 hlen = 40 |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2297 elif hconf != 'none': |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2298 msg = _("invalid value for extendedheader.index: '%s'\n") |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2299 ui.warn(msg % hconf) |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2300 finally: |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2301 buildopts['index'] = hlen |
d1901c4c8ec0
patch: add config knob for displaying the index header
Sean Farley <sean@farley.io>
parents:
30407
diff
changeset
|
2302 |
23433
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2303 if whitespace: |
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2304 buildopts['ignorews'] = get('ignore_all_space', 'ignorews') |
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2305 buildopts['ignorewsamount'] = get('ignore_space_change', |
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2306 'ignorewsamount') |
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2307 buildopts['ignoreblanklines'] = get('ignore_blank_lines', |
41dd76b3facb
patch.difffeatureopts: add a feature for whitespace diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23432
diff
changeset
|
2308 'ignoreblanklines') |
34013
da07367d683b
mdiff: add a --ignore-space-at-eol option
David Soria Parra <davidsp@fb.com>
parents:
33884
diff
changeset
|
2309 buildopts['ignorewseol'] = get('ignore_space_at_eol', 'ignorewseol') |
23434
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2310 if formatchanging: |
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2311 buildopts['text'] = opts and opts.get('text') |
31822
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
2312 binary = None if opts is None else opts.get('binary') |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
2313 buildopts['nobinary'] = (not binary if binary is not None |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
2314 else get('nobinary', forceplain=False)) |
23434
60300a4c0ae5
patch.difffeatureopts: add a feature for format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents:
23433
diff
changeset
|
2315 buildopts['noprefix'] = get('noprefix', forceplain=False) |
23432
27af986a332b
patch.difffeatureopts: add a feature for diff.git
Siddharth Agarwal <sid0@fb.com>
parents:
23431
diff
changeset
|
2316 |
31631
a7acda2de4b8
diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31630
diff
changeset
|
2317 return mdiff.diffopts(**pycompat.strkwargs(buildopts)) |
10615
3bb438ce4458
patch/diff: move diff related code next to each other
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10611
diff
changeset
|
2318 |
31274
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2319 def diff(repo, node1=None, node2=None, match=None, changes=None, |
34856
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2320 opts=None, losedatafn=None, prefix='', relroot='', copy=None, |
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2321 hunksfilterfn=None): |
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7267
diff
changeset
|
2322 '''yields diff of changes to files between two nodes, or node and |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2323 working directory. |
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2324 |
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2325 if node1 is None, use first dirstate parent instead. |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2326 if node2 is None, compare node1 with working directory. |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2327 |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2328 losedatafn(**kwarg) is a callable run when opts.upgrade=True and |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2329 every time some change cannot be represented with the current |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2330 patch format. Return False to upgrade to git patch format, True to |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2331 accept the loss or raise an exception to abort the diff. It is |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2332 called with the name of current file being diffed as 'fn'. If set |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2333 to None, patches will always be upgraded to git format when |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2334 necessary. |
12167
d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net>
parents:
12144
diff
changeset
|
2335 |
d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net>
parents:
12144
diff
changeset
|
2336 prefix is a filename prefix that is prepended to all filenames on |
d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net>
parents:
12144
diff
changeset
|
2337 display (used for subrepos). |
24417
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2338 |
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2339 relroot, if not empty, must be normalized with a trailing /. Any match |
29422
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2340 patterns that fall outside it will be ignored. |
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2341 |
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2342 copy, if not empty, should contain mappings {dst@y: src@x} of copy |
34856
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2343 information. |
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2344 |
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2345 hunksfilterfn, if not None, should be a function taking a filectx and |
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2346 hunks generator that may yield filtered hunks. |
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2347 ''' |
34855
35c6a54ec1ff
diff: also yield file context objects in patch.trydiff() (API)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34566
diff
changeset
|
2348 for fctx1, fctx2, hdr, hunks in diffhunks( |
35c6a54ec1ff
diff: also yield file context objects in patch.trydiff() (API)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34566
diff
changeset
|
2349 repo, node1=node1, node2=node2, |
35c6a54ec1ff
diff: also yield file context objects in patch.trydiff() (API)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34566
diff
changeset
|
2350 match=match, changes=changes, opts=opts, |
35c6a54ec1ff
diff: also yield file context objects in patch.trydiff() (API)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34566
diff
changeset
|
2351 losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, |
35c6a54ec1ff
diff: also yield file context objects in patch.trydiff() (API)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34566
diff
changeset
|
2352 ): |
34856
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2353 if hunksfilterfn is not None: |
34908
907ff34e1460
log: add an assertion about fctx not being None in patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
2354 # If the file has been removed, fctx2 is None; but this should |
907ff34e1460
log: add an assertion about fctx not being None in patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
2355 # not occur here since we catch removed files early in |
35888
c8e2d6ed1f9e
cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents:
35850
diff
changeset
|
2356 # logcmdutil.getlinerangerevs() for 'hg log -L'. |
34908
907ff34e1460
log: add an assertion about fctx not being None in patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
2357 assert fctx2 is not None, \ |
907ff34e1460
log: add an assertion about fctx not being None in patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34856
diff
changeset
|
2358 'fctx2 unexpectly None in diff hunks filtering' |
34856
890afefa7296
diff: pass a diff hunks filter function from changeset_printer to patch.diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34855
diff
changeset
|
2359 hunks = hunksfilterfn(fctx2, hunks) |
31274
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2360 text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) |
34561
fe6125ebdf91
patch: rename "header" variable into "hdr" in diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34521
diff
changeset
|
2361 if hdr and (text or len(hdr) > 1): |
fe6125ebdf91
patch: rename "header" variable into "hdr" in diff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34521
diff
changeset
|
2362 yield '\n'.join(hdr) + '\n' |
31274
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2363 if text: |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2364 yield text |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2365 |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2366 def diffhunks(repo, node1=None, node2=None, match=None, changes=None, |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2367 opts=None, losedatafn=None, prefix='', relroot='', copy=None): |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2368 """Yield diff of changes to files in the form of (`header`, `hunks`) tuples |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2369 where `header` is a list of diff headers and `hunks` is an iterable of |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2370 (`hunkrange`, `hunklines`) tuples. |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2371 |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2372 See diff() for the meaning of parameters. |
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2373 """ |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2374 |
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2375 if opts is None: |
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2376 opts = mdiff.defaultopts |
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2377 |
9725
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
9712
diff
changeset
|
2378 if not node1 and not node2: |
13878
a8d13ee0ce68
misc: replace .parents()[0] with p1()
Matt Mackall <mpm@selenic.com>
parents:
13751
diff
changeset
|
2379 node1 = repo.dirstate.p1() |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2933
diff
changeset
|
2380 |
9123
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2381 def lrugetfilectx(): |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2382 cache = {} |
25113
0ca8410ea345
util: drop alias for collections.deque
Martin von Zweigbergk <martinvonz@google.com>
parents:
24845
diff
changeset
|
2383 order = collections.deque() |
9123
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2384 def getfilectx(f, ctx): |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2385 fctx = ctx.filectx(f, filelog=cache.get(f)) |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2386 if f not in cache: |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2387 if len(cache) > 20: |
16803
107a3270a24a
cleanup: use the deque type where appropriate
Bryan O'Sullivan <bryano@fb.com>
parents:
16705
diff
changeset
|
2388 del cache[order.popleft()] |
9684
618af2034ca6
patch: use the public ctx API instead of the internals
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9683
diff
changeset
|
2389 cache[f] = fctx.filelog() |
9123
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2390 else: |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2391 order.remove(f) |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2392 order.append(f) |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2393 return fctx |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2394 return getfilectx |
360f61c2919f
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
Brendan Cully <brendan@kublai.com>
parents:
8891
diff
changeset
|
2395 getfilectx = lrugetfilectx() |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2933
diff
changeset
|
2396 |
6747
f6c00b17387c
use repo[changeid] to get a changectx
Matt Mackall <mpm@selenic.com>
parents:
6743
diff
changeset
|
2397 ctx1 = repo[node1] |
7090
7b5c063b0b94
diff: pass contexts to status
Matt Mackall <mpm@selenic.com>
parents:
6953
diff
changeset
|
2398 ctx2 = repo[node2] |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2399 |
24433
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2400 relfiltered = False |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2401 if relroot != '' and match.always(): |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2402 # as a special case, create a new matcher with just the relroot |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2403 pats = [relroot] |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2404 match = scmutil.match(ctx2, pats, default='path') |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2405 relfiltered = True |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2406 |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2407 if not changes: |
7090
7b5c063b0b94
diff: pass contexts to status
Matt Mackall <mpm@selenic.com>
parents:
6953
diff
changeset
|
2408 changes = repo.status(ctx1, ctx2, match=match) |
6760
4faaa0535ea7
status: clean up all users for unknown files
Matt Mackall <mpm@selenic.com>
parents:
6758
diff
changeset
|
2409 modified, added, removed = changes[:3] |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2410 |
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2411 if not modified and not added and not removed: |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2412 return [] |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2413 |
24306
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
2414 if repo.ui.debugflag: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
2415 hexfunc = hex |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
2416 else: |
6ddc86eedc3b
style: kill ersatz if-else ternary operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
24269
diff
changeset
|
2417 hexfunc = short |
21833
c1ceec0c8cb4
patch: use ctx.node() instead of bare node variable
Sean Farley <sean.michael.farley@gmail.com>
parents:
21790
diff
changeset
|
2418 revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node] |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2419 |
29422
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2420 if copy is None: |
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2421 copy = {} |
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2422 if opts.git or opts.upgrade: |
40d53d4b5925
patch: allow copy information to be passed in
Henrik Stuart <henriks@unity3d.com>
parents:
29341
diff
changeset
|
2423 copy = copies.pathcopies(ctx1, ctx2, match=match) |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2424 |
24417
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2425 if relroot is not None: |
24433
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2426 if not relfiltered: |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2427 # XXX this would ideally be done in the matcher, but that is |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2428 # generally meant to 'or' patterns, not 'and' them. In this case we |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2429 # need to 'and' all the patterns from the matcher with relroot. |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2430 def filterrel(l): |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2431 return [f for f in l if f.startswith(relroot)] |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2432 modified = filterrel(modified) |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2433 added = filterrel(added) |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2434 removed = filterrel(removed) |
f5f4dc115fb2
patch.diff: restrict matcher to relative root in certain cases
Siddharth Agarwal <sid0@fb.com>
parents:
24417
diff
changeset
|
2435 relfiltered = True |
24417
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2436 # filter out copies where either side isn't inside the relative root |
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2437 copy = dict(((dst, src) for (dst, src) in copy.iteritems() |
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2438 if dst.startswith(relroot) |
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2439 and src.startswith(relroot))) |
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2440 |
27900
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2441 modifiedset = set(modified) |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2442 addedset = set(added) |
27901
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2443 removedset = set(removed) |
27900
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2444 for f in modified: |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2445 if f not in ctx1: |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2446 # Fix up added, since merged-in additions appear as |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2447 # modifications during merges |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2448 modifiedset.remove(f) |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2449 addedset.add(f) |
27901
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2450 for f in removed: |
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2451 if f not in ctx1: |
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2452 # Merged-in additions that are then removed are reported as removed. |
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2453 # They are not in ctx1, so We don't want to show them in the diff. |
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2454 removedset.remove(f) |
27900
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2455 modified = sorted(modifiedset) |
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2456 added = sorted(addedset) |
27901
29c8e35d3283
diff: don't crash when merged-in addition was removed (issue4786)
Martin von Zweigbergk <martinvonz@google.com>
parents:
27900
diff
changeset
|
2457 removed = sorted(removedset) |
35589
3328d53254d9
py3: use list() to get a list of items using dict.items()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35582
diff
changeset
|
2458 for dst, src in list(copy.items()): |
27902
51b6ce257e0a
diff: don't crash when merged-in addition is copied
Martin von Zweigbergk <martinvonz@google.com>
parents:
27901
diff
changeset
|
2459 if src not in ctx1: |
51b6ce257e0a
diff: don't crash when merged-in addition is copied
Martin von Zweigbergk <martinvonz@google.com>
parents:
27901
diff
changeset
|
2460 # Files merged in during a merge and then copied/renamed are |
51b6ce257e0a
diff: don't crash when merged-in addition is copied
Martin von Zweigbergk <martinvonz@google.com>
parents:
27901
diff
changeset
|
2461 # reported as copies. We want to show them in the diff as additions. |
51b6ce257e0a
diff: don't crash when merged-in addition is copied
Martin von Zweigbergk <martinvonz@google.com>
parents:
27901
diff
changeset
|
2462 del copy[dst] |
27900
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2463 |
17299
e51d4aedace9
check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents:
16834
diff
changeset
|
2464 def difffn(opts, losedata): |
e51d4aedace9
check-code: indent 4 spaces in py files
Mads Kiilerich <mads@kiilerich.com>
parents:
16834
diff
changeset
|
2465 return trydiff(repo, revs, ctx1, ctx2, modified, added, removed, |
24417
f2e1e097cda1
patch.diff: add support for diffs relative to a subdirectory
Siddharth Agarwal <sid0@fb.com>
parents:
24416
diff
changeset
|
2466 copy, getfilectx, opts, losedata, prefix, relroot) |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2467 if opts.upgrade and not opts.git: |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2468 try: |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2469 def losedata(fn): |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2470 if not losedatafn or not losedatafn(fn=fn): |
16687
e34106fa0dc3
cleanup: "raise SomeException()" -> "raise SomeException"
Brodie Rao <brodie@sf.io>
parents:
16686
diff
changeset
|
2471 raise GitDiffRequired |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2472 # Buffer the whole output until we are sure it can be generated |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2473 return list(difffn(opts.copy(git=False), losedata)) |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2474 except GitDiffRequired: |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2475 return difffn(opts.copy(git=True), None) |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2476 else: |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2477 return difffn(opts, None) |
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2478 |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2479 def difflabel(func, *args, **kw): |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2480 '''yields 2-tuples of (output, label) based on the output of func()''' |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2481 inlinecolor = False |
35366
dce761558329
py3: handle keyword arguments correctly in patch.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35328
diff
changeset
|
2482 if kw.get(r'opts'): |
dce761558329
py3: handle keyword arguments correctly in patch.py
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35328
diff
changeset
|
2483 inlinecolor = kw[r'opts'].worddiff |
15201
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2484 headprefixes = [('diff', 'diff.diffline'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2485 ('copy', 'diff.extended'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2486 ('rename', 'diff.extended'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2487 ('old', 'diff.extended'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2488 ('new', 'diff.extended'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2489 ('deleted', 'diff.extended'), |
30790
dbcc10cf7f8d
patch: add label for coloring the index extended header
Sean Farley <sean@farley.io>
parents:
30789
diff
changeset
|
2490 ('index', 'diff.extended'), |
30808
8540967cd9e0
patch: add label for coloring the similarity extended header
Sean Farley <sean@farley.io>
parents:
30807
diff
changeset
|
2491 ('similarity', 'diff.extended'), |
15201
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2492 ('---', 'diff.file_a'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2493 ('+++', 'diff.file_b')] |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2494 textprefixes = [('@', 'diff.hunk'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2495 ('-', 'diff.deleted'), |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2496 ('+', 'diff.inserted')] |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2497 head = False |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2498 for chunk in func(*args, **kw): |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2499 lines = chunk.split('\n') |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2500 matches = {} |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2501 if inlinecolor: |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2502 matches = _findmatches(lines) |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2503 for i, line in enumerate(lines): |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2504 if i != 0: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2505 yield ('\n', '') |
15201
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2506 if head: |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2507 if line.startswith('@'): |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2508 head = False |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2509 else: |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2510 if line and not line.startswith((' ', '+', '-', '@', '\\')): |
15201
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2511 head = True |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2512 stripline = line |
22460
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2513 diffline = False |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2514 if not head and line and line.startswith(('+', '-')): |
22460
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2515 # highlight tabs and trailing whitespace, but only in |
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2516 # changed lines |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2517 stripline = line.rstrip() |
22460
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2518 diffline = True |
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2519 |
15201
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2520 prefixes = textprefixes |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2521 if head: |
2c4fdee4d1a8
diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com>
parents:
15159
diff
changeset
|
2522 prefixes = headprefixes |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2523 for prefix, label in prefixes: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2524 if stripline.startswith(prefix): |
22460
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2525 if diffline: |
35328
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2526 if i in matches: |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2527 for t, l in _inlinediff(lines[i].rstrip(), |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2528 lines[matches[i]].rstrip(), |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2529 label): |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2530 yield (t, l) |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2531 else: |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2532 for token in tabsplitter.findall(stripline): |
36447
588048a6a8d3
py3: slice over bytes or use .startswith() to prevent getting ascii values
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36423
diff
changeset
|
2533 if token.startswith('\t'): |
35328
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2534 yield (token, 'diff.tab') |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2535 else: |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2536 yield (token, label) |
22460
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2537 else: |
c343557a8442
patch: enable diff.tab markup for the color extension
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
22296
diff
changeset
|
2538 yield (stripline, label) |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2539 break |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2540 else: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2541 yield (line, '') |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2542 if line != stripline: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2543 yield (line[len(stripline):], 'diff.trailingwhitespace') |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2544 |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2545 def _findmatches(slist): |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2546 '''Look for insertion matches to deletion and returns a dict of |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2547 correspondences. |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2548 ''' |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2549 lastmatch = 0 |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2550 matches = {} |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2551 for i, line in enumerate(slist): |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2552 if line == '': |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2553 continue |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2554 if line.startswith('-'): |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2555 lastmatch = max(lastmatch, i) |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2556 newgroup = False |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2557 for j, newline in enumerate(slist[lastmatch + 1:]): |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2558 if newline == '': |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2559 continue |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2560 if newline.startswith('-') and newgroup: # too far, no match |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2561 break |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2562 if newline.startswith('+'): # potential match |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2563 newgroup = True |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2564 sim = difflib.SequenceMatcher(None, line, newline).ratio() |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2565 if sim > 0.7: |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2566 lastmatch = lastmatch + 1 + j |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2567 matches[i] = lastmatch |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2568 matches[lastmatch] = i |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2569 break |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2570 return matches |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2571 |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2572 def _inlinediff(s1, s2, operation): |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2573 '''Perform string diff to highlight specific changes.''' |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2574 operation_skip = ('+', '?') if operation == 'diff.deleted' else ('-', '?') |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2575 if operation == 'diff.deleted': |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2576 s2, s1 = s1, s2 |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2577 |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2578 buff = [] |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2579 # we never want to higlight the leading +- |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2580 if operation == 'diff.deleted' and s2.startswith('-'): |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2581 label = operation |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2582 token = '-' |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2583 s2 = s2[1:] |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2584 s1 = s1[1:] |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2585 elif operation == 'diff.inserted' and s1.startswith('+'): |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2586 label = operation |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2587 token = '+' |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2588 s2 = s2[1:] |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2589 s1 = s1[1:] |
35311
12ce62c72c24
patch: catch unexpected case in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35310
diff
changeset
|
2590 else: |
12ce62c72c24
patch: catch unexpected case in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35310
diff
changeset
|
2591 raise error.ProgrammingError("Case not expected, operation = %s" % |
12ce62c72c24
patch: catch unexpected case in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35310
diff
changeset
|
2592 operation) |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2593 |
35383
82c3762349ac
patch: do not break up multibyte character when highlighting word
Yuya Nishihara <yuya@tcha.org>
parents:
35366
diff
changeset
|
2594 s = difflib.ndiff(_nonwordre.split(s2), _nonwordre.split(s1)) |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2595 for part in s: |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2596 if part.startswith(operation_skip) or len(part) == 2: |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2597 continue |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2598 l = operation + '.highlight' |
37471
51d5e1ff0613
py3: use s.startswith() instead of s[n] while parsing patches
Yuya Nishihara <yuya@tcha.org>
parents:
37468
diff
changeset
|
2599 if part.startswith(' '): |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2600 l = operation |
35328
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2601 if part[2:] == '\t': |
4937db58b663
patch: move part of tabsplitter logic in _inlinediff
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35311
diff
changeset
|
2602 l = 'diff.tab' |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2603 if l == label: # contiguous token with same label |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2604 token += part[2:] |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2605 continue |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2606 else: |
35310
10cce12fdcd3
patch: reverse _inlinediff output for consistency
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35277
diff
changeset
|
2607 buff.append((token, label)) |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2608 label = l |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2609 token = part[2:] |
35310
10cce12fdcd3
patch: reverse _inlinediff output for consistency
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35277
diff
changeset
|
2610 buff.append((token, label)) |
35277
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2611 |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2612 return buff |
6ba79cf34f5e
patch: add within-line color diff capacity
Matthieu Laneuville <matthieu.laneuville@octobus.net>
parents:
35191
diff
changeset
|
2613 |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2614 def diffui(*args, **kw): |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2615 '''like diff(), but yields 2-tuples of (output, label) for ui.write()''' |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2616 return difflabel(diff, *args, **kw) |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2617 |
27900
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2618 def _filepairs(modified, added, removed, copy, opts): |
24106
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2619 '''generates tuples (f1, f2, copyop), where f1 is the name of the file |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2620 before and f2 is the the name after. For added files, f1 will be None, |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2621 and for removed files, f2 will be None. copyop may be set to None, 'copy' |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2622 or 'rename' (the latter two only if opts.git is set).''' |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2623 gone = set() |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2624 |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2625 copyto = dict([(v, k) for k, v in copy.items()]) |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2626 |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2627 addedset, removedset = set(added), set(removed) |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2628 |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2629 for f in sorted(modified + added + removed): |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2630 copyop = None |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2631 f1, f2 = f, f |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2632 if f in addedset: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2633 f1 = None |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2634 if f in copy: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2635 if opts.git: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2636 f1 = copy[f] |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2637 if f1 in removedset and f1 not in gone: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2638 copyop = 'rename' |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2639 gone.add(f1) |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2640 else: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2641 copyop = 'copy' |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2642 elif f in removedset: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2643 f2 = None |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2644 if opts.git: |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2645 # have we already reported a copy above? |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2646 if (f in copyto and copyto[f] in addedset |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2647 and copy[copyto[f]] == f): |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2648 continue |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2649 yield f1, f2, copyop |
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2650 |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2651 def trydiff(repo, revs, ctx1, ctx2, modified, added, removed, |
24416
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2652 copy, getfilectx, opts, losedatafn, prefix, relroot): |
24371
8a997bd73448
patch.trydiff: add a docstring
Siddharth Agarwal <sid0@fb.com>
parents:
24346
diff
changeset
|
2653 '''given input data, generate a diff and yield it in blocks |
8a997bd73448
patch.trydiff: add a docstring
Siddharth Agarwal <sid0@fb.com>
parents:
24346
diff
changeset
|
2654 |
8a997bd73448
patch.trydiff: add a docstring
Siddharth Agarwal <sid0@fb.com>
parents:
24346
diff
changeset
|
2655 If generating a diff would lose data like flags or binary data and |
8a997bd73448
patch.trydiff: add a docstring
Siddharth Agarwal <sid0@fb.com>
parents:
24346
diff
changeset
|
2656 losedatafn is not None, it will be called. |
8a997bd73448
patch.trydiff: add a docstring
Siddharth Agarwal <sid0@fb.com>
parents:
24346
diff
changeset
|
2657 |
24416
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2658 relroot is removed and prefix is added to every path in the diff output. |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2659 |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2660 If relroot is not empty, this function expects every path in modified, |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2661 added, removed and copy to start with it.''' |
12167
d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net>
parents:
12144
diff
changeset
|
2662 |
17946
1e13b1184292
diff: move index header generation to patch
Guillermo Pérez <bisho@fb.com>
parents:
17945
diff
changeset
|
2663 def gitindex(text): |
1e13b1184292
diff: move index header generation to patch
Guillermo Pérez <bisho@fb.com>
parents:
17945
diff
changeset
|
2664 if not text: |
19875
c172660eee01
patch: Fix nullid for binary git diffs (issue4054)
Johan Bjork <jbjoerk@gmail.com>
parents:
19513
diff
changeset
|
2665 text = "" |
17946
1e13b1184292
diff: move index header generation to patch
Guillermo Pérez <bisho@fb.com>
parents:
17945
diff
changeset
|
2666 l = len(text) |
29341
0d83ad967bf8
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
Augie Fackler <raf@durin42.com>
parents:
29326
diff
changeset
|
2667 s = hashlib.sha1('blob %d\0' % l) |
17946
1e13b1184292
diff: move index header generation to patch
Guillermo Pérez <bisho@fb.com>
parents:
17945
diff
changeset
|
2668 s.update(text) |
35582
72b91f905065
py3: use node.hex(h.digest()) instead of h.hexdigest()
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35383
diff
changeset
|
2669 return hex(s.digest()) |
17946
1e13b1184292
diff: move index header generation to patch
Guillermo Pérez <bisho@fb.com>
parents:
17945
diff
changeset
|
2670 |
23300
f8b5c3e77d4b
patch.trydiff: add support for noprefix
Siddharth Agarwal <sid0@fb.com>
parents:
23297
diff
changeset
|
2671 if opts.noprefix: |
f8b5c3e77d4b
patch.trydiff: add support for noprefix
Siddharth Agarwal <sid0@fb.com>
parents:
23297
diff
changeset
|
2672 aprefix = bprefix = '' |
f8b5c3e77d4b
patch.trydiff: add support for noprefix
Siddharth Agarwal <sid0@fb.com>
parents:
23297
diff
changeset
|
2673 else: |
f8b5c3e77d4b
patch.trydiff: add support for noprefix
Siddharth Agarwal <sid0@fb.com>
parents:
23297
diff
changeset
|
2674 aprefix = 'a/' |
f8b5c3e77d4b
patch.trydiff: add support for noprefix
Siddharth Agarwal <sid0@fb.com>
parents:
23297
diff
changeset
|
2675 bprefix = 'b/' |
f8b5c3e77d4b
patch.trydiff: add support for noprefix
Siddharth Agarwal <sid0@fb.com>
parents:
23297
diff
changeset
|
2676 |
24021
f51a822dcf3b
trydiff: remove unused argument to diffline()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24020
diff
changeset
|
2677 def diffline(f, revs): |
24024
a5c7e86a81c1
trydiff: move check for quietness out of diffline()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24023
diff
changeset
|
2678 revinfo = ' '.join(["-r %s" % rev for rev in revs]) |
24025
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2679 return 'diff %s %s' % (revinfo, f) |
17941
9a6e4d5d7ea8
diff: move diffline to patch module
Guillermo Pérez <bisho@fb.com>
parents:
17940
diff
changeset
|
2680 |
32188
776127b29a5c
diff: use fctx.size() to test empty
Jun Wu <quark@fb.com>
parents:
32187
diff
changeset
|
2681 def isempty(fctx): |
776127b29a5c
diff: use fctx.size() to test empty
Jun Wu <quark@fb.com>
parents:
32187
diff
changeset
|
2682 return fctx is None or fctx.size() == 0 |
776127b29a5c
diff: use fctx.size() to test empty
Jun Wu <quark@fb.com>
parents:
32187
diff
changeset
|
2683 |
36607
c6061cadb400
util: extract all date-related utils in utils/dateutil module
Boris Feld <boris.feld@octobus.net>
parents:
36447
diff
changeset
|
2684 date1 = dateutil.datestr(ctx1.date()) |
c6061cadb400
util: extract all date-related utils in utils/dateutil module
Boris Feld <boris.feld@octobus.net>
parents:
36447
diff
changeset
|
2685 date2 = dateutil.datestr(ctx2.date()) |
3967
dccb83241dd0
patch: use contexts for diff
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3963
diff
changeset
|
2686 |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2687 gitmode = {'l': '120000', 'x': '100755', '': '100644'} |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2688 |
33495
d78b7d734b63
patch: use devel.all-warnings to replace devel.all
Jun Wu <quark@fb.com>
parents:
33270
diff
changeset
|
2689 if relroot != '' and (repo.ui.configbool('devel', 'all-warnings') |
24416
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2690 or repo.ui.configbool('devel', 'check-relroot')): |
33584
ea8c2478c907
patch: update copying of dict keys and values to work on Python 3
Augie Fackler <augie@google.com>
parents:
33495
diff
changeset
|
2691 for f in modified + added + removed + list(copy) + list(copy.values()): |
24416
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2692 if f is not None and not f.startswith(relroot): |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2693 raise AssertionError( |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2694 "file %s doesn't start with relroot %s" % (f, relroot)) |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2695 |
27900
27572a5cc409
diff: move status fixup earlier, out of _filepairs()
Martin von Zweigbergk <martinvonz@google.com>
parents:
27796
diff
changeset
|
2696 for f1, f2, copyop in _filepairs(modified, added, removed, copy, opts): |
24105
0f8baebcdbea
trydiff: read file data in only one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24104
diff
changeset
|
2697 content1 = None |
0f8baebcdbea
trydiff: read file data in only one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24104
diff
changeset
|
2698 content2 = None |
32187
e62cf13e0858
diff: use fctx.isbinary() to test binary
Jun Wu <quark@fb.com>
parents:
32068
diff
changeset
|
2699 fctx1 = None |
e62cf13e0858
diff: use fctx.isbinary() to test binary
Jun Wu <quark@fb.com>
parents:
32068
diff
changeset
|
2700 fctx2 = None |
24103
c666c85f71ba
trydiff: read flags in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24102
diff
changeset
|
2701 flag1 = None |
c666c85f71ba
trydiff: read flags in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24102
diff
changeset
|
2702 flag2 = None |
24107
32e8d94b9473
trydiff: transpose 'if opts.git or losedatafn' with 'if f[12]'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24106
diff
changeset
|
2703 if f1: |
32187
e62cf13e0858
diff: use fctx.isbinary() to test binary
Jun Wu <quark@fb.com>
parents:
32068
diff
changeset
|
2704 fctx1 = getfilectx(f1, ctx1) |
24107
32e8d94b9473
trydiff: transpose 'if opts.git or losedatafn' with 'if f[12]'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24106
diff
changeset
|
2705 if opts.git or losedatafn: |
32e8d94b9473
trydiff: transpose 'if opts.git or losedatafn' with 'if f[12]'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24106
diff
changeset
|
2706 flag1 = ctx1.flags(f1) |
32e8d94b9473
trydiff: transpose 'if opts.git or losedatafn' with 'if f[12]'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24106
diff
changeset
|
2707 if f2: |
32187
e62cf13e0858
diff: use fctx.isbinary() to test binary
Jun Wu <quark@fb.com>
parents:
32068
diff
changeset
|
2708 fctx2 = getfilectx(f2, ctx2) |
24107
32e8d94b9473
trydiff: transpose 'if opts.git or losedatafn' with 'if f[12]'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24106
diff
changeset
|
2709 if opts.git or losedatafn: |
32e8d94b9473
trydiff: transpose 'if opts.git or losedatafn' with 'if f[12]'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24106
diff
changeset
|
2710 flag2 = ctx2.flags(f2) |
32190 | 2711 # if binary is True, output "summary" or "base85", but not "text diff" |
35850
079b27b5a869
patch: avoid repeated binary checks if all files in a patch are text
Joerg Sonnenberger <joerg@bec.de>
parents:
35633
diff
changeset
|
2712 if opts.text: |
079b27b5a869
patch: avoid repeated binary checks if all files in a patch are text
Joerg Sonnenberger <joerg@bec.de>
parents:
35633
diff
changeset
|
2713 binary = False |
079b27b5a869
patch: avoid repeated binary checks if all files in a patch are text
Joerg Sonnenberger <joerg@bec.de>
parents:
35633
diff
changeset
|
2714 else: |
35951
8b6dd3922f70
patch: unify check_binary and binary flags
Yuya Nishihara <yuya@tcha.org>
parents:
35888
diff
changeset
|
2715 binary = any(f.isbinary() for f in [fctx1, fctx2] if f is not None) |
24057
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2716 |
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2717 if losedatafn and not opts.git: |
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2718 if (binary or |
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2719 # copy/rename |
24106
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2720 f2 in copy or |
24057
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2721 # empty file creation |
32188
776127b29a5c
diff: use fctx.size() to test empty
Jun Wu <quark@fb.com>
parents:
32187
diff
changeset
|
2722 (not f1 and isempty(fctx2)) or |
24057
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2723 # empty file deletion |
32188
776127b29a5c
diff: use fctx.size() to test empty
Jun Wu <quark@fb.com>
parents:
32187
diff
changeset
|
2724 (isempty(fctx1) and not f2) or |
24057
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2725 # create with flags |
24101
1ea90d140ee3
trydiff: make filenames None when they don't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
24058
diff
changeset
|
2726 (not f1 and flag2) or |
24057
696d0fd77d94
trydiff: collect all lossiness checks in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
24056
diff
changeset
|
2727 # change flags |
24101
1ea90d140ee3
trydiff: make filenames None when they don't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
24058
diff
changeset
|
2728 (f1 and f2 and flag1 != flag2)): |
24106
9cf9432a505b
trydiff: extract function that generates filename pairs
Martin von Zweigbergk <martinvonz@google.com>
parents:
24105
diff
changeset
|
2729 losedatafn(f2 or f1) |
10189
e451e599fbcf
patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com>
parents:
10151
diff
changeset
|
2730 |
24416
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2731 path1 = f1 or f2 |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2732 path2 = f2 or f1 |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2733 path1 = posixpath.join(prefix, path1[len(relroot):]) |
f07047a506d1
patch.trydiff: add support for stripping a relative root
Siddharth Agarwal <sid0@fb.com>
parents:
24390
diff
changeset
|
2734 path2 = posixpath.join(prefix, path2[len(relroot):]) |
23998
b65637247c69
trydiff: collect header-writing in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
23997
diff
changeset
|
2735 header = [] |
24022
da63f557d0dc
trydiff: make 'revs' ignored if opts.git is set
Martin von Zweigbergk <martinvonz@google.com>
parents:
24021
diff
changeset
|
2736 if opts.git: |
24025
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2737 header.append('diff --git %s%s %s%s' % |
24020
cc81e6da0757
trydiff: move git-header code out of diffline function
Martin von Zweigbergk <martinvonz@google.com>
parents:
24005
diff
changeset
|
2738 (aprefix, path1, bprefix, path2)) |
24101
1ea90d140ee3
trydiff: make filenames None when they don't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
24058
diff
changeset
|
2739 if not f1: # added |
24025
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2740 header.append('new file mode %s' % gitmode[flag2]) |
24101
1ea90d140ee3
trydiff: make filenames None when they don't exist
Martin von Zweigbergk <martinvonz@google.com>
parents:
24058
diff
changeset
|
2741 elif not f2: # removed |
24025
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2742 header.append('deleted file mode %s' % gitmode[flag1]) |
23998
b65637247c69
trydiff: collect header-writing in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
23997
diff
changeset
|
2743 else: # modified/copied/renamed |
24000
82e3324c4df9
trydiff: inline sole addmodehdr() call
Martin von Zweigbergk <martinvonz@google.com>
parents:
23999
diff
changeset
|
2744 mode1, mode2 = gitmode[flag1], gitmode[flag2] |
82e3324c4df9
trydiff: inline sole addmodehdr() call
Martin von Zweigbergk <martinvonz@google.com>
parents:
23999
diff
changeset
|
2745 if mode1 != mode2: |
24025
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2746 header.append('old mode %s' % mode1) |
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2747 header.append('new mode %s' % mode2) |
24055
7f4e6b5fce03
trydiff: rename 'op' to make it more specific
Martin von Zweigbergk <martinvonz@google.com>
parents:
24025
diff
changeset
|
2748 if copyop is not None: |
30807
6381a6dbc325
patch: use opt.showsimilarity to calculate and show the similarity
Sean Farley <sean@farley.io>
parents:
30806
diff
changeset
|
2749 if opts.showsimilarity: |
6381a6dbc325
patch: use opt.showsimilarity to calculate and show the similarity
Sean Farley <sean@farley.io>
parents:
30806
diff
changeset
|
2750 sim = similar.score(ctx1[path1], ctx2[path2]) * 100 |
6381a6dbc325
patch: use opt.showsimilarity to calculate and show the similarity
Sean Farley <sean@farley.io>
parents:
30806
diff
changeset
|
2751 header.append('similarity index %d%%' % sim) |
24055
7f4e6b5fce03
trydiff: rename 'op' to make it more specific
Martin von Zweigbergk <martinvonz@google.com>
parents:
24025
diff
changeset
|
2752 header.append('%s from %s' % (copyop, path1)) |
7f4e6b5fce03
trydiff: rename 'op' to make it more specific
Martin von Zweigbergk <martinvonz@google.com>
parents:
24025
diff
changeset
|
2753 header.append('%s to %s' % (copyop, path2)) |
24024
a5c7e86a81c1
trydiff: move check for quietness out of diffline()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24023
diff
changeset
|
2754 elif revs and not repo.ui.quiet: |
24022
da63f557d0dc
trydiff: make 'revs' ignored if opts.git is set
Martin von Zweigbergk <martinvonz@google.com>
parents:
24021
diff
changeset
|
2755 header.append(diffline(path1, revs)) |
23998
b65637247c69
trydiff: collect header-writing in one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
23997
diff
changeset
|
2756 |
32189
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2757 # fctx.is | diffopts | what to | is fctx.data() |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2758 # binary() | text nobinary git index | output? | outputted? |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2759 # ------------------------------------|---------------------------- |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2760 # yes | no no no * | summary | no |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2761 # yes | no no yes * | base85 | yes |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2762 # yes | no yes no * | summary | no |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2763 # yes | no yes yes 0 | summary | no |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2764 # yes | no yes yes >0 | summary | semi [1] |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2765 # yes | yes * * * | text diff | yes |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2766 # no | * * * * | text diff | yes |
15f10ee778f8
diff: draw a table about binary diff behaviors
Jun Wu <quark@fb.com>
parents:
32188
diff
changeset
|
2767 # [1]: hash(fctx.data()) is outputted. so fctx.data() cannot be faked |
32191
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2768 if binary and (not opts.git or (opts.git and opts.nobinary and not |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2769 opts.index)): |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2770 # fast path: no binary content will be displayed, content1 and |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2771 # content2 are only used for equivalent test. cmp() could have a |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2772 # fast path. |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2773 if fctx1 is not None: |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2774 content1 = b'\0' |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2775 if fctx2 is not None: |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2776 if fctx1 is not None and not fctx1.cmp(fctx2): |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2777 content2 = b'\0' # not different |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2778 else: |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2779 content2 = b'\0\0' |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2780 else: |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2781 # normal path: load contents |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2782 if fctx1 is not None: |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2783 content1 = fctx1.data() |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2784 if fctx2 is not None: |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2785 content2 = fctx2.data() |
31f42e683321
diff: add a fast path to avoid loading binary contents
Jun Wu <quark@fb.com>
parents:
32190
diff
changeset
|
2786 |
32190 | 2787 if binary and opts.git and not opts.nobinary: |
23997
8b88870cbd1e
trydiff: make variable names more consistent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23996
diff
changeset
|
2788 text = mdiff.b85diff(content1, content2) |
24056
ae453d166d51
trydiff: replace 'binarydiff' variable by 'binary' variable
Martin von Zweigbergk <martinvonz@google.com>
parents:
24055
diff
changeset
|
2789 if text: |
24025
bbb011f4eb32
trydiff: join elements in 'header' list by '\n'
Martin von Zweigbergk <martinvonz@google.com>
parents:
24024
diff
changeset
|
2790 header.append('index %s..%s' % |
24005
2c166f6b5d10
trydiff: inline indexmeta()
Martin von Zweigbergk <martinvonz@google.com>
parents:
24001
diff
changeset
|
2791 (gitindex(content1), gitindex(content2))) |
31274
a8023a64c40d
patch: add a diffhunks function yielding (diffheaders, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31273
diff
changeset
|
2792 hunks = (None, [text]), |
23753
e30c6aa6f2a2
trydiff: replace 'dodiff = False' by 'continue'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23752
diff
changeset
|
2793 else: |
30789
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2794 if opts.git and opts.index > 0: |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2795 flag = flag1 |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2796 if flag is None: |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2797 flag = flag2 |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2798 header.append('index %s..%s %s' % |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2799 (gitindex(content1)[0:opts.index], |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2800 gitindex(content2)[0:opts.index], |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2801 gitmode[flag])) |
b8ad243f5ded
patch: add index line for diff output
Sean Farley <sean@farley.io>
parents:
30788
diff
changeset
|
2802 |
31273
92714858dd3e
mdiff: let unidiff return (diffheader, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31271
diff
changeset
|
2803 uheaders, hunks = mdiff.unidiff(content1, date1, |
92714858dd3e
mdiff: let unidiff return (diffheader, hunks)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31271
diff
changeset
|
2804 content2, date2, |
35951
8b6dd3922f70
patch: unify check_binary and binary flags
Yuya Nishihara <yuya@tcha.org>
parents:
35888
diff
changeset
|
2805 path1, path2, |
8b6dd3922f70
patch: unify check_binary and binary flags
Yuya Nishihara <yuya@tcha.org>
parents:
35888
diff
changeset
|
2806 binary=binary, opts=opts) |
31271
b3861be6aa6c
mdiff: distinguish diff headers from hunks in unidiff()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31233
diff
changeset
|
2807 header.extend(uheaders) |
34855
35c6a54ec1ff
diff: also yield file context objects in patch.trydiff() (API)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34566
diff
changeset
|
2808 yield fctx1, fctx2, header, hunks |
2874
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2868
diff
changeset
|
2809 |
14401
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2810 def diffstatsum(stats): |
14437
cbe13e6bdc34
patch: restore the previous output of 'diff --stat'
Steven Brown <StevenGBrown@gmail.com>
parents:
14435
diff
changeset
|
2811 maxfile, maxtotal, addtotal, removetotal, binary = 0, 0, 0, 0, False |
14401
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2812 for f, a, r, b in stats: |
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2813 maxfile = max(maxfile, encoding.colwidth(f)) |
14437
cbe13e6bdc34
patch: restore the previous output of 'diff --stat'
Steven Brown <StevenGBrown@gmail.com>
parents:
14435
diff
changeset
|
2814 maxtotal = max(maxtotal, a + r) |
14401
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2815 addtotal += a |
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2816 removetotal += r |
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2817 binary = binary or b |
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2818 |
14437
cbe13e6bdc34
patch: restore the previous output of 'diff --stat'
Steven Brown <StevenGBrown@gmail.com>
parents:
14435
diff
changeset
|
2819 return maxfile, maxtotal, addtotal, removetotal, binary |
14401
7bb7be1c1385
patch: add diffstatsum helper
Matt Mackall <mpm@selenic.com>
parents:
14400
diff
changeset
|
2820 |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2821 def diffstatdata(lines): |
13395
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
13112
diff
changeset
|
2822 diffre = re.compile('^diff .*-r [a-z0-9]+\s(.*)$') |
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
13112
diff
changeset
|
2823 |
14400
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2824 results = [] |
15363
628a4a9e411d
diffstat: be more picky when marking file as 'binary' (issue2816)
Patrick Mezard <pmezard@gmail.com>
parents:
15201
diff
changeset
|
2825 filename, adds, removes, isbinary = None, 0, 0, False |
14400
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2826 |
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2827 def addresult(): |
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2828 if filename: |
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2829 results.append((filename, adds, removes, isbinary)) |
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2830 |
32320
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2831 # inheader is used to track if a line is in the |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2832 # header portion of the diff. This helps properly account |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2833 # for lines that start with '--' or '++' |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2834 inheader = False |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2835 |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2836 for line in lines: |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2837 if line.startswith('diff'): |
14400
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2838 addresult() |
32320
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2839 # starting a new file diff |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2840 # set numbers to 0 and reset inheader |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2841 inheader = True |
15363
628a4a9e411d
diffstat: be more picky when marking file as 'binary' (issue2816)
Patrick Mezard <pmezard@gmail.com>
parents:
15201
diff
changeset
|
2842 adds, removes, isbinary = 0, 0, False |
18830
6b827d84d286
patch: match 'diff --git a/' instead of 'diff --git'
Sean Farley <sean.michael.farley@gmail.com>
parents:
18824
diff
changeset
|
2843 if line.startswith('diff --git a/'): |
20972
4e2fb0ad00a9
diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents:
20869
diff
changeset
|
2844 filename = gitre.search(line).group(2) |
13395
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
13112
diff
changeset
|
2845 elif line.startswith('diff -r'): |
8761
0289f384e1e5
Generally replace "file name" with "filename" in help and comments.
timeless <timeless@gmail.com>
parents:
8632
diff
changeset
|
2846 # format: "diff -r ... -r ... filename" |
13395
104c9ed93fc5
diffstat: fix parsing of filenames with spaces
Gastón Kleiman <gaston.kleiman@gmail.com>
parents:
13112
diff
changeset
|
2847 filename = diffre.search(line).group(1) |
32320
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2848 elif line.startswith('@@'): |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2849 inheader = False |
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2850 elif line.startswith('+') and not inheader: |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2851 adds += 1 |
32320
0e29ce16ec38
diffstat: properly count lines starting in '--' or '++' (issue5479)
Andrew Zwicky <andrew.zwicky@gmail.com>
parents:
32201
diff
changeset
|
2852 elif line.startswith('-') and not inheader: |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2853 removes += 1 |
15363
628a4a9e411d
diffstat: be more picky when marking file as 'binary' (issue2816)
Patrick Mezard <pmezard@gmail.com>
parents:
15201
diff
changeset
|
2854 elif (line.startswith('GIT binary patch') or |
628a4a9e411d
diffstat: be more picky when marking file as 'binary' (issue2816)
Patrick Mezard <pmezard@gmail.com>
parents:
15201
diff
changeset
|
2855 line.startswith('Binary file')): |
628a4a9e411d
diffstat: be more picky when marking file as 'binary' (issue2816)
Patrick Mezard <pmezard@gmail.com>
parents:
15201
diff
changeset
|
2856 isbinary = True |
14400
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2857 addresult() |
cd1ca2556cac
diffstatdata: no longer a generator
Matt Mackall <mpm@selenic.com>
parents:
14392
diff
changeset
|
2858 return results |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2859 |
30407
e1677cc29da6
patch: remove unused git parameter from patch.diffstat()
Henning Schild <henning@hennsch.de>
parents:
30397
diff
changeset
|
2860 def diffstat(lines, width=80): |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2861 output = [] |
14402
f03f08240c32
patch: use diffstatsum in diffstat
Matt Mackall <mpm@selenic.com>
parents:
14401
diff
changeset
|
2862 stats = diffstatdata(lines) |
14437
cbe13e6bdc34
patch: restore the previous output of 'diff --stat'
Steven Brown <StevenGBrown@gmail.com>
parents:
14435
diff
changeset
|
2863 maxname, maxtotal, totaladds, totalremoves, hasbinary = diffstatsum(stats) |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2864 |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2865 countwidth = len(str(maxtotal)) |
9642
7d17794f08a9
diffstat: with --git, mark binary files with Bin
Brodie Rao <me+hg@dackz.net>
parents:
9639
diff
changeset
|
2866 if hasbinary and countwidth < 3: |
7d17794f08a9
diffstat: with --git, mark binary files with Bin
Brodie Rao <me+hg@dackz.net>
parents:
9639
diff
changeset
|
2867 countwidth = 3 |
9330
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2868 graphwidth = width - countwidth - maxname - 6 |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2869 if graphwidth < 10: |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2870 graphwidth = 10 |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2871 |
9330
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2872 def scale(i): |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2873 if maxtotal <= graphwidth: |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2874 return i |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2875 # If diffstat runs out of room it doesn't print anything, |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2876 # which isn't very useful, so always print at least one + or - |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2877 # if there were at least some changes. |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2878 return max(i * graphwidth // maxtotal, int(bool(i))) |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2879 |
14402
f03f08240c32
patch: use diffstatsum in diffstat
Matt Mackall <mpm@selenic.com>
parents:
14401
diff
changeset
|
2880 for filename, adds, removes, isbinary in stats: |
15363
628a4a9e411d
diffstat: be more picky when marking file as 'binary' (issue2816)
Patrick Mezard <pmezard@gmail.com>
parents:
15201
diff
changeset
|
2881 if isbinary: |
9642
7d17794f08a9
diffstat: with --git, mark binary files with Bin
Brodie Rao <me+hg@dackz.net>
parents:
9639
diff
changeset
|
2882 count = 'Bin' |
7d17794f08a9
diffstat: with --git, mark binary files with Bin
Brodie Rao <me+hg@dackz.net>
parents:
9639
diff
changeset
|
2883 else: |
33104
53238678b1ca
py3: use '%d' to convert integers to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33096
diff
changeset
|
2884 count = '%d' % (adds + removes) |
9330
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2885 pluses = '+' * scale(adds) |
be2a13153372
diffstat: scale adds/removes proportionally to graph width
Brodie Rao <me+hg@dackz.net>
parents:
9328
diff
changeset
|
2886 minuses = '-' * scale(removes) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11377
diff
changeset
|
2887 output.append(' %s%s | %*s %s%s\n' % |
14402
f03f08240c32
patch: use diffstatsum in diffstat
Matt Mackall <mpm@selenic.com>
parents:
14401
diff
changeset
|
2888 (filename, ' ' * (maxname - encoding.colwidth(filename)), |
f03f08240c32
patch: use diffstatsum in diffstat
Matt Mackall <mpm@selenic.com>
parents:
14401
diff
changeset
|
2889 countwidth, count, pluses, minuses)) |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2890 |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2891 if stats: |
16683 | 2892 output.append(_(' %d files changed, %d insertions(+), ' |
2893 '%d deletions(-)\n') | |
7860
162fd31bbd93
diffstat: use width 80 by default and avoid division by zero
Matt Mackall <mpm@selenic.com>
parents:
7783
diff
changeset
|
2894 % (len(stats), totaladds, totalremoves)) |
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2895 |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7521
diff
changeset
|
2896 return ''.join(output) |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2897 |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2898 def diffstatui(*args, **kw): |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2899 '''like diffstat(), but yields 2-tuples of (output, label) for |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2900 ui.write() |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2901 ''' |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2902 |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2903 for line in diffstat(*args, **kw).splitlines(): |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2904 if line and line[-1] in '+-': |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2905 name, graph = line.rsplit(' ', 1) |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2906 yield (name + ' ', '') |
33096
d9962854a4a2
py3: add b'' to make the regex pattern bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32990
diff
changeset
|
2907 m = re.search(br'\++', graph) |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2908 if m: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2909 yield (m.group(0), 'diffstat.inserted') |
33096
d9962854a4a2
py3: add b'' to make the regex pattern bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32990
diff
changeset
|
2910 m = re.search(br'-+', graph) |
10818
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2911 if m: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2912 yield (m.group(0), 'diffstat.deleted') |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2913 else: |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2914 yield (line, '') |
d14d45fae927
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org>
parents:
10751
diff
changeset
|
2915 yield ('\n', '') |