-
Notifications
You must be signed in to change notification settings - Fork 71
/
patch.py
342 lines (285 loc) · 11.8 KB
/
patch.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
# -*- coding: utf-8 -*-
# The MIT License (MIT)
# Copyright (c) 2014 Matias Bordese
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
# OR OTHER DEALINGS IN THE SOFTWARE.
"""Classes used by the unified diff parser to keep the diff data."""
from __future__ import unicode_literals
import codecs
import sys
from unidiff.constants import (
DEFAULT_ENCODING,
LINE_TYPE_ADDED,
LINE_TYPE_CONTEXT,
LINE_TYPE_EMPTY,
LINE_TYPE_REMOVED,
RE_HUNK_BODY_LINE,
RE_HUNK_HEADER,
RE_SOURCE_FILENAME,
RE_TARGET_FILENAME,
)
from unidiff.errors import UnidiffParseError
PY2 = sys.version_info[0] == 2
if PY2:
open_file = codecs.open
make_str = lambda x: x.encode(DEFAULT_ENCODING)
def implements_to_string(cls):
cls.__unicode__ = cls.__str__
cls.__str__ = lambda x: x.__unicode__().encode(DEFAULT_ENCODING)
return cls
else:
open_file = open
make_str = str
implements_to_string = lambda x: x
unicode = str
@implements_to_string
class Line(object):
"""A diff line."""
def __init__(self, value, line_type,
source_line_no=None, target_line_no=None, diff_line_no=None):
super(Line, self).__init__()
self.source_line_no = source_line_no
self.target_line_no = target_line_no
self.diff_line_no = diff_line_no
self.line_type = line_type
self.value = value
def __repr__(self):
return make_str("<Line: %s>") % make_str(self)
def __str__(self):
return "%s%s" % (self.line_type, self.value)
@property
def is_added(self):
return self.line_type == LINE_TYPE_ADDED
@property
def is_removed(self):
return self.line_type == LINE_TYPE_REMOVED
@property
def is_context(self):
return self.line_type == LINE_TYPE_CONTEXT
@implements_to_string
class Hunk(list):
"""Each of the modified blocks of a file."""
def __init__(self, src_start=0, src_len=0, tgt_start=0, tgt_len=0,
section_header=''):
if src_len is None:
src_len = 1
if tgt_len is None:
tgt_len = 1
self.added = 0 # number of added lines
self.removed = 0 # number of removed lines
self.source = []
self.source_start = int(src_start)
self.source_length = int(src_len)
self.target = []
self.target_start = int(tgt_start)
self.target_length = int(tgt_len)
self.section_header = section_header
def __repr__(self):
value = "<Hunk: @@ %d,%d %d,%d @@ %s>" % (self.source_start,
self.source_length,
self.target_start,
self.target_length,
self.section_header)
return make_str(value)
def __str__(self):
head = "@@ -%d,%d +%d,%d @@ %s\n" % (
self.source_start, self.source_length,
self.target_start, self.target_length, self.section_header)
content = '\n'.join(unicode(line) for line in self)
return head + content
def append(self, line):
"""Append the line to hunk, and keep track of source/target lines."""
super(Hunk, self).append(line)
s = str(line)
if line.is_added:
self.added += 1
self.target.append(s)
elif line.is_removed:
self.removed += 1
self.source.append(s)
elif line.is_context:
self.target.append(s)
self.source.append(s)
def is_valid(self):
"""Check hunk header data matches entered lines info."""
return (len(self.source) == self.source_length and
len(self.target) == self.target_length)
def source_lines(self):
"""Hunk lines from source file (generator)."""
return (l for l in self if l.is_context or l.is_removed)
def target_lines(self):
"""Hunk lines from target file (generator)."""
return (l for l in self if l.is_context or l.is_added)
class PatchedFile(list):
"""Patch updated file, it is a list of Hunks."""
def __init__(self, source='', target='',
source_timestamp=None, target_timestamp=None):
super(PatchedFile, self).__init__()
self.source_file = source
self.source_timestamp = source_timestamp
self.target_file = target
self.target_timestamp = target_timestamp
def __repr__(self):
return make_str("<PatchedFile: %s>") % make_str(self.path)
def __str__(self):
source = "--- %s\n" % self.source_file
target = "+++ %s\n" % self.target_file
hunks = '\n'.join(unicode(hunk) for hunk in self)
return source + target + hunks
def _parse_hunk(self, header, diff, encoding):
"""Parse hunk details."""
header_info = RE_HUNK_HEADER.match(header)
hunk_info = header_info.groups()
hunk = Hunk(*hunk_info)
source_line_no = hunk.source_start
target_line_no = hunk.target_start
expected_source_end = source_line_no + hunk.source_length
expected_target_end = target_line_no + hunk.target_length
for diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
valid_line = RE_HUNK_BODY_LINE.match(line)
if not valid_line:
raise UnidiffParseError('Hunk diff line expected: %s' % line)
line_type = valid_line.group('line_type')
if line_type == LINE_TYPE_EMPTY:
line_type = LINE_TYPE_CONTEXT
value = valid_line.group('value')
original_line = Line(value, line_type=line_type)
if line_type == LINE_TYPE_ADDED:
original_line.target_line_no = target_line_no
target_line_no += 1
elif line_type == LINE_TYPE_REMOVED:
original_line.source_line_no = source_line_no
source_line_no += 1
elif line_type == LINE_TYPE_CONTEXT:
original_line.target_line_no = target_line_no
target_line_no += 1
original_line.source_line_no = source_line_no
source_line_no += 1
else:
original_line = None
if original_line:
original_line.diff_line_no = diff_line_no
hunk.append(original_line)
# if hunk source/target lengths are ok, hunk is complete
if (source_line_no == expected_source_end
and target_line_no == expected_target_end):
break
self.append(hunk)
@property
def path(self):
"""Return the file path abstracted from VCS."""
if (self.source_file.startswith('a/') and
self.target_file.startswith('b/')):
filepath = self.source_file[2:]
elif (self.source_file.startswith('a/') and
self.target_file == '/dev/null'):
filepath = self.source_file[2:]
elif (self.target_file.startswith('b/') and
self.source_file == '/dev/null'):
filepath = self.target_file[2:]
else:
filepath = self.source_file
return filepath
@property
def added(self):
"""Return the file total added lines."""
return sum([hunk.added for hunk in self])
@property
def removed(self):
"""Return the file total removed lines."""
return sum([hunk.removed for hunk in self])
@property
def is_added_file(self):
"""Return True if this patch adds the file."""
return (len(self) == 1 and self[0].source_start == 0 and
self[0].source_length == 0)
@property
def is_removed_file(self):
"""Return True if this patch removes the file."""
return (len(self) == 1 and self[0].target_start == 0 and
self[0].target_length == 0)
@property
def is_modified_file(self):
"""Return True if this patch modifies the file."""
return not (self.is_added_file or self.is_removed_file)
@implements_to_string
class PatchSet(list):
"""A list of PatchedFiles."""
def __init__(self, f, encoding=None):
super(PatchSet, self).__init__()
# make sure we pass an iterator object to parse
data = iter(f)
# if encoding is None, assume we are reading unicode data
self._parse(data, encoding=encoding)
def __repr__(self):
return make_str('<PatchSet: %s>') % super(PatchSet, self).__repr__()
def __str__(self):
return '\n'.join(unicode(patched_file) for patched_file in self)
def _parse(self, diff, encoding):
current_file = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(source_file, target_file,
source_timestamp, target_timestamp)
self.append(current_file)
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
@classmethod
def from_filename(cls, filename, encoding=DEFAULT_ENCODING, errors=None):
"""Return a PatchSet instance given a diff filename."""
with open_file(filename, 'r', encoding=encoding, errors=errors) as f:
instance = cls(f)
return instance
@property
def added_files(self):
"""Return patch added files as a list."""
return [f for f in self if f.is_added_file]
@property
def removed_files(self):
"""Return patch removed files as a list."""
return [f for f in self if f.is_removed_file]
@property
def modified_files(self):
"""Return patch modified files as a list."""
return [f for f in self if f.is_modified_file]