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

Improve Bitbucket diff handling for new and deleted files and add error protection for missing file links

Browse Source
This commit is contained in:
mrT23
2024-08-12 21:15:26 +03:00
parent 7f0e6aeb37
commit 8589941ffe
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pr_agent/git_providers/bitbucket_provider.py
View File

@ -150,16 +150,20 @@ class BitbucketProvider(GitProvider):
return [] return []
# bitbucket diff has a header for each file, we need to remove it: # bitbucket diff has a header for each file, we need to remove it:
# "diff --git filename # "diff --git filename
# new file mode 100644 (optional)
# index caa56f0..61528d7 100644 # index caa56f0..61528d7 100644
# --- a/pr_agent/cli_pip.py # --- a/pr_agent/cli_pip.py
# +++ b/pr_agent/cli_pip.py # +++ b/pr_agent/cli_pip.py
# @@ -... @@" # @@ -... @@"
for i, _ in enumerate(diff_split): for i, _ in enumerate(diff_split):
diff_split_lines = diff_split[i].splitlines() diff_split_lines = diff_split[i].splitlines()
if (len(diff_split_lines) > 5 and if (len(diff_split_lines) >= 6) and \
diff_split_lines[2].startswith("---") and ((diff_split_lines[2].startswith("---") and
diff_split_lines[3].startswith("+++") and diff_split_lines[3].startswith("+++") and
diff_split_lines[4].startswith("@@")): diff_split_lines[4].startswith("@@")) or
(diff_split_lines[3].startswith("---") and # new or deleted file
diff_split_lines[4].startswith("+++") and
diff_split_lines[5].startswith("@@"))):
diff_split[i] = "\n".join(diff_split_lines[4:]) diff_split[i] = "\n".join(diff_split_lines[4:])
else: else:
get_logger().error(f"Error - failed to remove the bitbucket header from diff {i}") get_logger().error(f"Error - failed to remove the bitbucket header from diff {i}")
@ -173,8 +177,14 @@ class BitbucketProvider(GitProvider):
continue continue
try: try:
original_file_content_str = self._get_pr_file_content(diff.old.get_data("links")['self']['href']) if diff.old.get_data("links"):
new_file_content_str = self._get_pr_file_content(diff.new.get_data("links")['self']['href']) original_file_content_str = self._get_pr_file_content(diff.old.get_data("links")['self']['href'])
else:
original_file_content_str = ""
if diff.new.get_data("links"):
new_file_content_str = self._get_pr_file_content(diff.new.get_data("links")['self']['href'])
else:
new_file_content_str = ""
except Exception as e: except Exception as e:
get_logger().exception(f"Error - bitbucket failed to get file content, error: {e}") get_logger().exception(f"Error - bitbucket failed to get file content, error: {e}")
original_file_content_str = "" original_file_content_str = ""