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