bence/pydiffchecker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bence:929f08419d38aa431b4e26e9940feb3296a83cad
Branches Tags
bence:master
bence:0.1.5
bence:0.1.3
bence:0.1.2
bence:0.1.1
bence:0.1.0
bence:0.0.3
bence:0.0.2
bence:0.0.1
..
compare: bence:b8f095e1a9292e09d36a989723ad2955a43c5caf
Branches Tags
bence:master
bence:0.1.5
bence:0.1.3
bence:0.1.2
bence:0.1.1
bence:0.1.0
bence:0.0.3
bence:0.0.2
bence:0.0.1

No commits in common. "929f08419d38aa431b4e26e9940feb3296a83cad" and "b8f095e1a9292e09d36a989723ad2955a43c5caf" have entirely different histories.
929f08419d ... b8f095e1a9

1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
pydiffchecker/line_shift_checker.py
View File

@ -29,7 +29,7 @@ class ShiftedLines(Sized, Iterable):
class LineShiftChecker: class LineShiftChecker:
SUBMODULE_MODE = '160000' SUBMODULE_MODE = '160000'
DIFF_BLOCK_REGEX = r'@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@' DIFF_BLOCK_REGEX = r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@'
def __init__(self, revision_since: str, revision_until: str) -> None: def __init__(self, revision_since: str, revision_until: str) -> None:
self.revision_since = revision_since self.revision_since = revision_since
@ -55,8 +55,8 @@ class LineShiftChecker:
for line in process_output: for line in process_output:
matches = re.search(LineShiftChecker.DIFF_BLOCK_REGEX, line) matches = re.search(LineShiftChecker.DIFF_BLOCK_REGEX, line)
if matches: if matches:
diff_block_src_start = max(int(matches.group(1)), 1) # line number should never be 0 diff_block_src_start = int(matches.group(1))
diff_block_dst_start = max(int(matches.group(2)), 1) # line number should never be 0 diff_block_dst_start = int(matches.group(3))
# fill shifted lines between 2 diff blocks # fill shifted lines between 2 diff blocks
for i in range(0, diff_block_src_start - src_line_index): for i in range(0, diff_block_src_start - src_line_index):