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

Merge pull request #1179 from Codium-ai/tr/patch_fixes

Browse Source 
fix: handle deleted files in git patch processing and update section header logic
This commit is contained in:
Tal
2024-08-27 09:37:35 +03:00
committed by GitHub
parent 53a974c282 c2f52539aa
commit cdf13925b0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pr_agent/algo/git_patch_processing.py
View File

@ -85,7 +85,9 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0,
for i,line, in enumerate(lines_before): for i,line, in enumerate(lines_before):
if section_header in line: if section_header in line:
found_header = True found_header = True
extended_start1 = extended_start1 + i # Update start and size in one line each
extended_start1, extended_start2 = extended_start1 + i, extended_start2 + i
extended_size1, extended_size2 = extended_size1 - i, extended_size2 - i
get_logger().debug(f"Found section header in line {i} before the hunk") get_logger().debug(f"Found section header in line {i} before the hunk")
section_header = '' section_header = ''
break break
@ -236,6 +238,10 @@ __old hunk__
line6 line6
... ...
""" """
# if the file was deleted, return a message indicating that the file was deleted
if hasattr(file, 'edit_type') and file.edit_type == EDIT_TYPE.DELETED:
return f"\n\n## file '{file.filename.strip()}' was deleted\n"
patch_with_lines_str = f"\n\n## file: '{file.filename.strip()}'\n" patch_with_lines_str = f"\n\n## file: '{file.filename.strip()}'\n"
patch_lines = patch.splitlines() patch_lines = patch.splitlines()
RE_HUNK_HEADER = re.compile( RE_HUNK_HEADER = re.compile(