xiaxinhang/pr-agent
1
0
Fork 0
mirror of https://github.com/qodo-ai/pr-agent.git synced 2025-07-04 21:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor patch extension logic to handle cases with zero extra lines

Browse Source
This commit is contained in:
mrT23
2024-08-11 12:56:56 +03:00
parent df04a7e046
commit e85b75fe64
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pr_agent/algo/git_patch_processing.py
View File

@ -46,6 +46,8 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch
start1, size1, size2 = map(int, res[:3]) start1, size1, size2 = map(int, res[:3])
start2 = 0 start2 = 0
section_header = res[4] section_header = res[4]
if patch_extra_lines_before > 0 or patch_extra_lines_after > 0:
extended_start1 = max(1, start1 - patch_extra_lines_before) extended_start1 = max(1, start1 - patch_extra_lines_before)
extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after
if extended_start1 - 1 + extended_size1 > len(original_lines): if extended_start1 - 1 + extended_size1 > len(original_lines):
@ -54,11 +56,22 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch
extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after
if extended_start2 - 1 + extended_size2 > len_original_lines: if extended_start2 - 1 + extended_size2 > len_original_lines:
extended_size2 = len_original_lines - extended_start2 + 1 extended_size2 = len_original_lines - extended_start2 + 1
delta_lines = original_lines[extended_start1 - 1:start1 - 1]
delta_lines = [f' {line}' for line in delta_lines]
if section_header:
for line in delta_lines:
if section_header in line:
section_header = '' # remove section header if it is in the extra delta lines
break
else:
extended_start1 = start1
extended_size1 = size1
extended_start2 = start2
extended_size2 = size2
delta_lines = []
extended_patch_lines.append( extended_patch_lines.append(
f'@@ -{extended_start1},{extended_size1} ' f'@@ -{extended_start1},{extended_size1} '
f'+{extended_start2},{extended_size2} @@ {section_header}') f'+{extended_start2},{extended_size2} @@ {section_header}')
delta_lines = original_lines[extended_start1 - 1:start1 - 1]
delta_lines = [f' {line}' for line in delta_lines]
extended_patch_lines.extend(delta_lines) # one to zero based extended_patch_lines.extend(delta_lines) # one to zero based
continue continue
extended_patch_lines.append(line) extended_patch_lines.append(line)