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

Merge pull request #315 from Codium-ai/tr/fixes_20_9

Browse Source 
Fixing potential null values in git patch processing
This commit is contained in:
mrT23
2023-09-20 17:00:59 +03:00
committed by GitHub
parent 911ad299e2 992f51a019
commit 04162564ca
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pr_agent/algo/git_patch_processing.py
View File

@ -40,12 +40,16 @@ def extend_patch(original_file_str, patch_str, num_lines) -> str:
extended_patch_lines.extend( extended_patch_lines.extend(
original_lines[start1 + size1 - 1:start1 + size1 - 1 + num_lines]) original_lines[start1 + size1 - 1:start1 + size1 - 1 + num_lines])
res = list(match.groups())
for i in range(len(res)):
if res[i] is None:
res[i] = 0
try: try:
start1, size1, start2, size2 = map(int, match.groups()[:4]) start1, size1, start2, size2 = map(int, res[:4])
except: # '@@ -0,0 +1 @@' case except: # '@@ -0,0 +1 @@' case
start1, size1, size2 = map(int, match.groups()[:3]) start1, size1, size2 = map(int, res[:3])
start2 = 0 start2 = 0
section_header = match.groups()[4] section_header = res[4]
extended_start1 = max(1, start1 - num_lines) extended_start1 = max(1, start1 - num_lines)
extended_size1 = size1 + (start1 - extended_start1) + num_lines extended_size1 = size1 + (start1 - extended_start1) + num_lines
extended_start2 = max(1, start2 - num_lines) extended_start2 = max(1, start2 - num_lines)
@ -207,10 +211,15 @@ __old hunk__
old_content_lines = [] old_content_lines = []
if match: if match:
prev_header_line = header_line prev_header_line = header_line
res = list(match.groups())
for i in range(len(res)):
if res[i] is None:
res[i] = 0
try: try:
start1, size1, start2, size2 = map(int, match.groups()[:4]) start1, size1, start2, size2 = map(int, res[:4])
except: # '@@ -0,0 +1 @@' case except: # '@@ -0,0 +1 @@' case
start1, size1, size2 = map(int, match.groups()[:3]) start1, size1, size2 = map(int, res[:3])
start2 = 0 start2 = 0
elif line.startswith('+'): elif line.startswith('+'):