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 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646
|
# -*- coding: utf-8 -*-
# The MIT License (MIT)
# Copyright (c) 2014-2022 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,
DEV_NULL,
LINE_TYPE_ADDED,
LINE_TYPE_CONTEXT,
LINE_TYPE_EMPTY,
LINE_TYPE_REMOVED,
LINE_TYPE_NO_NEWLINE,
LINE_VALUE_NO_NEWLINE,
RE_DIFF_GIT_DELETED_FILE,
RE_DIFF_GIT_HEADER,
RE_DIFF_GIT_HEADER_URI_LIKE,
RE_DIFF_GIT_HEADER_NO_PREFIX,
RE_DIFF_GIT_NEW_FILE,
RE_HUNK_BODY_LINE,
RE_HUNK_EMPTY_BODY_LINE,
RE_HUNK_HEADER,
RE_SOURCE_FILENAME,
RE_TARGET_FILENAME,
RE_NO_NEWLINE_MARKER,
RE_BINARY_DIFF,
)
from unidiff.errors import UnidiffParseError
PY2 = sys.version_info[0] == 2
if PY2:
import io
from StringIO import StringIO
open_file = io.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:
from io import StringIO
from typing import Iterable, Optional, Union
open_file = open
make_str = str
implements_to_string = lambda x: x
unicode = str
basestring = 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):
# type: (str, str, Optional[int], Optional[int], Optional[int]) -> 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):
# type: () -> str
return make_str("<Line: %s%s>") % (self.line_type, self.value)
def __str__(self):
# type: () -> str
return "%s%s" % (self.line_type, self.value)
def __eq__(self, other):
# type: (Line) -> bool
return (self.source_line_no == other.source_line_no and
self.target_line_no == other.target_line_no and
self.diff_line_no == other.diff_line_no and
self.line_type == other.line_type and
self.value == other.value)
@property
def is_added(self):
# type: () -> bool
return self.line_type == LINE_TYPE_ADDED
@property
def is_removed(self):
# type: () -> bool
return self.line_type == LINE_TYPE_REMOVED
@property
def is_context(self):
# type: () -> bool
return self.line_type == LINE_TYPE_CONTEXT
@implements_to_string
class PatchInfo(list):
"""Lines with extended patch info.
Format of this info is not documented and it very much depends on
patch producer.
"""
def __repr__(self):
# type: () -> str
value = "<PatchInfo: %s>" % self[0].strip()
return make_str(value)
def __str__(self):
# type: () -> str
return ''.join(unicode(line) for line in self)
@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=''):
# type: (int, int, int, int, str) -> None
super(Hunk, self).__init__()
if src_len is None:
src_len = 1
if tgt_len is None:
tgt_len = 1
self.source_start = int(src_start)
self.source_length = int(src_len)
self.target_start = int(tgt_start)
self.target_length = int(tgt_len)
self.section_header = section_header
self._added = None # Optional[int]
self._removed = None # Optional[int]
def __repr__(self):
# type: () -> str
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):
# type: () -> str
# section header is optional and thus we output it only if it's present
head = "@@ -%d,%d +%d,%d @@%s\n" % (
self.source_start, self.source_length,
self.target_start, self.target_length,
' ' + self.section_header if self.section_header else '')
content = ''.join(unicode(line) for line in self)
return head + content
def append(self, line):
# type: (Line) -> None
"""Append the line to hunk, and keep track of source/target lines."""
# Make sure the line is encoded correctly. This is a no-op except for
# potentially raising a UnicodeDecodeError.
str(line)
super(Hunk, self).append(line)
@property
def added(self):
# type: () -> Optional[int]
if self._added is not None:
return self._added
# re-calculate each time to allow for hunk modifications
# (which should mean metadata_only switch wasn't used)
return sum(1 for line in self if line.is_added)
@property
def removed(self):
# type: () -> Optional[int]
if self._removed is not None:
return self._removed
# re-calculate each time to allow for hunk modifications
# (which should mean metadata_only switch wasn't used)
return sum(1 for line in self if line.is_removed)
def is_valid(self):
# type: () -> bool
"""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):
# type: () -> Iterable[Line]
"""Hunk lines from source file (generator)."""
return (l for l in self if l.is_context or l.is_removed)
@property
def source(self):
# type: () -> Iterable[str]
return [str(l) for l in self.source_lines()]
def target_lines(self):
# type: () -> Iterable[Line]
"""Hunk lines from target file (generator)."""
return (l for l in self if l.is_context or l.is_added)
@property
def target(self):
# type: () -> Iterable[str]
return [str(l) for l in self.target_lines()]
class PatchedFile(list):
"""Patch updated file, it is a list of Hunks."""
def __init__(self, patch_info=None, source='', target='',
source_timestamp=None, target_timestamp=None,
is_binary_file=False):
# type: (Optional[PatchInfo], str, str, Optional[str], Optional[str], bool, bool) -> None
super(PatchedFile, self).__init__()
self.patch_info = patch_info
self.source_file = source
self.source_timestamp = source_timestamp
self.target_file = target
self.target_timestamp = target_timestamp
self.is_binary_file = is_binary_file
def __repr__(self):
# type: () -> str
return make_str("<PatchedFile: %s>") % make_str(self.path)
def __str__(self):
# type: () -> str
source = ''
target = ''
# patch info is optional
info = '' if self.patch_info is None else str(self.patch_info)
if not self.is_binary_file and self:
source = "--- %s%s\n" % (
self.source_file,
'\t' + self.source_timestamp if self.source_timestamp else '')
target = "+++ %s%s\n" % (
self.target_file,
'\t' + self.target_timestamp if self.target_timestamp else '')
hunks = ''.join(unicode(hunk) for hunk in self)
return info + source + target + hunks
def _parse_hunk(self, header, diff, encoding, metadata_only):
# type: (str, enumerate[str], Optional[str], bool) -> None
"""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
added = 0
removed = 0
for diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
if metadata_only:
# quick line type detection, no regex required
line_type = line[0] if line else LINE_TYPE_CONTEXT
if line_type not in (LINE_TYPE_ADDED,
LINE_TYPE_REMOVED,
LINE_TYPE_CONTEXT,
LINE_TYPE_NO_NEWLINE):
raise UnidiffParseError(
'Hunk diff line expected: %s' % line)
if line_type == LINE_TYPE_ADDED:
target_line_no += 1
added += 1
elif line_type == LINE_TYPE_REMOVED:
source_line_no += 1
removed += 1
elif line_type == LINE_TYPE_CONTEXT:
target_line_no += 1
source_line_no += 1
# no file content tracking
original_line = None
else:
# parse diff line content
valid_line = RE_HUNK_BODY_LINE.match(line)
if not valid_line:
valid_line = RE_HUNK_EMPTY_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') # type: str
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
original_line.source_line_no = source_line_no
target_line_no += 1
source_line_no += 1
elif line_type == LINE_TYPE_NO_NEWLINE:
pass
else:
original_line = None
# stop parsing if we got past expected number of lines
if (source_line_no > expected_source_end or
target_line_no > expected_target_end):
raise UnidiffParseError('Hunk is longer than expected')
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
# report an error if we haven't got expected number of lines
if (source_line_no < expected_source_end or
target_line_no < expected_target_end):
raise UnidiffParseError('Hunk is shorter than expected')
if metadata_only:
# HACK: set fixed calculated values when metadata_only is enabled
hunk._added = added
hunk._removed = removed
self.append(hunk)
def _add_no_newline_marker_to_last_hunk(self):
# type: () -> None
if not self:
raise UnidiffParseError(
'Unexpected marker:' + LINE_VALUE_NO_NEWLINE)
last_hunk = self[-1]
last_hunk.append(
Line(LINE_VALUE_NO_NEWLINE + '\n', line_type=LINE_TYPE_NO_NEWLINE))
def _append_trailing_empty_line(self):
# type: () -> None
if not self:
raise UnidiffParseError('Unexpected trailing newline character')
last_hunk = self[-1]
last_hunk.append(Line('\n', line_type=LINE_TYPE_EMPTY))
@property
def path(self):
# type: () -> str
"""Return the file path abstracted from VCS."""
filepath = self.source_file
if filepath in (None, DEV_NULL) or (
self.is_rename and self.target_file not in (None, DEV_NULL)):
# if this is a rename, prefer the target filename
filepath = self.target_file
if filepath.startswith('a/') or filepath.startswith('b/'):
filepath = filepath[2:]
return filepath
@property
def added(self):
# type: () -> int
"""Return the file total added lines."""
return sum([hunk.added for hunk in self])
@property
def removed(self):
# type: () -> int
"""Return the file total removed lines."""
return sum([hunk.removed for hunk in self])
@property
def is_rename(self):
return (self.source_file != DEV_NULL
and self.target_file != DEV_NULL
and self.source_file[2:] != self.target_file[2:])
@property
def is_added_file(self):
# type: () -> bool
"""Return True if this patch adds the file."""
if self.source_file == DEV_NULL:
return True
return (len(self) == 1 and self[0].source_start == 0 and
self[0].source_length == 0)
@property
def is_removed_file(self):
# type: () -> bool
"""Return True if this patch removes the file."""
if self.target_file == DEV_NULL:
return True
return (len(self) == 1 and self[0].target_start == 0 and
self[0].target_length == 0)
@property
def is_modified_file(self):
# type: () -> bool
"""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, metadata_only=False):
# type: (Union[StringIO, str], Optional[str], bool) -> None
super(PatchSet, self).__init__()
# convert string inputs to StringIO objects
if isinstance(f, basestring):
f = self._convert_string(f, encoding) # type: StringIO
# make sure we pass an iterator object to parse
data = iter(f)
# if encoding is None, assume we are reading unicode data
# when metadata_only is True, only perform a minimal metadata parsing
# (ie. hunks without content) which is around 2.5-6 times faster;
# it will still validate the diff metadata consistency and get counts
self._parse(data, encoding=encoding, metadata_only=metadata_only)
def __repr__(self):
# type: () -> str
return make_str('<PatchSet: %s>') % super(PatchSet, self).__repr__()
def __str__(self):
# type: () -> str
return ''.join(unicode(patched_file) for patched_file in self)
def _parse(self, diff, encoding, metadata_only):
# type: (StringIO, Optional[str], bool) -> None
current_file = None
patch_info = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for a git file rename
is_diff_git_header = RE_DIFF_GIT_HEADER.match(line) or \
RE_DIFF_GIT_HEADER_URI_LIKE.match(line) or \
RE_DIFF_GIT_HEADER_NO_PREFIX.match(line)
if is_diff_git_header:
patch_info = PatchInfo()
source_file = is_diff_git_header.group('source')
target_file = is_diff_git_header.group('target')
current_file = PatchedFile(
patch_info, source_file, target_file, None, None)
self.append(current_file)
patch_info.append(line)
continue
# check for a git new file
is_diff_git_new_file = RE_DIFF_GIT_NEW_FILE.match(line)
if is_diff_git_new_file:
if current_file is None or patch_info is None:
raise UnidiffParseError('Unexpected new file found: %s' % line)
current_file.source_file = DEV_NULL
patch_info.append(line)
continue
# check for a git deleted file
is_diff_git_deleted_file = RE_DIFF_GIT_DELETED_FILE.match(line)
if is_diff_git_deleted_file:
if current_file is None or patch_info is None:
raise UnidiffParseError('Unexpected deleted file found: %s' % line)
current_file.target_file = DEV_NULL
patch_info.append(line)
continue
# 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, unless we are processing a rename
# (in that case, source files should match)
if current_file is not None and not (
current_file.source_file == source_file):
current_file = None
elif current_file is not None:
current_file.source_timestamp = source_timestamp
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
if current_file is not None and not (current_file.target_file == target_file):
raise UnidiffParseError('Target without source: %s' % line)
if current_file is None:
# add current file to PatchSet
current_file = PatchedFile(
patch_info, source_file, target_file,
source_timestamp, target_timestamp)
self.append(current_file)
patch_info = None
else:
current_file.target_timestamp = target_timestamp
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
patch_info = None
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding, metadata_only)
continue
# check for no newline marker
is_no_newline = RE_NO_NEWLINE_MARKER.match(line)
if is_no_newline:
if current_file is None:
raise UnidiffParseError('Unexpected marker: %s' % line)
current_file._add_no_newline_marker_to_last_hunk()
continue
# sometimes hunks can be followed by empty lines
if line == '\n' and current_file is not None:
current_file._append_trailing_empty_line()
continue
# if nothing has matched above then this line is a patch info
if patch_info is None:
current_file = None
patch_info = PatchInfo()
is_binary_diff = RE_BINARY_DIFF.match(line)
if is_binary_diff:
source_file = is_binary_diff.group('source_filename')
target_file = is_binary_diff.group('target_filename')
patch_info.append(line)
if current_file is not None:
current_file.is_binary_file = True
else:
current_file = PatchedFile(
patch_info, source_file, target_file, is_binary_file=True)
self.append(current_file)
patch_info = None
current_file = None
continue
if line == 'GIT binary patch\n':
current_file.is_binary_file = True
patch_info = None
current_file = None
continue
patch_info.append(line)
@classmethod
def from_filename(cls, filename, encoding=DEFAULT_ENCODING, errors=None, newline=None):
# type: (str, str, Optional[str]) -> PatchSet
"""Return a PatchSet instance given a diff filename."""
with open_file(filename, 'r', encoding=encoding, errors=errors, newline=newline) as f:
instance = cls(f)
return instance
@staticmethod
def _convert_string(data, encoding=None, errors='strict'):
# type: (Union[str, bytes], str, str) -> StringIO
if encoding is not None:
# if encoding is given, assume bytes and decode
data = unicode(data, encoding=encoding, errors=errors)
return StringIO(data)
@classmethod
def from_string(cls, data, encoding=None, errors='strict'):
# type: (str, str, Optional[str]) -> PatchSet
"""Return a PatchSet instance given a diff string."""
return cls(cls._convert_string(data, encoding, errors))
@property
def added_files(self):
# type: () -> list[PatchedFile]
"""Return patch added files as a list."""
return [f for f in self if f.is_added_file]
@property
def removed_files(self):
# type: () -> list[PatchedFile]
"""Return patch removed files as a list."""
return [f for f in self if f.is_removed_file]
@property
def modified_files(self):
# type: () -> list[PatchedFile]
"""Return patch modified files as a list."""
return [f for f in self if f.is_modified_file]
@property
def added(self):
# type: () -> int
"""Return the patch total added lines."""
return sum([f.added for f in self])
@property
def removed(self):
# type: () -> int
"""Return the patch total removed lines."""
return sum([f.removed for f in self])
|