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

Improve logging and diff filtering in Bitbucket provider

Browse Source 
- Enhance logging to include both kept and filtered file names
- Add conditional check to filter diff elements based on original and current diffs
This commit is contained in:
mrT23
2024-08-13 08:59:45 +03:00
parent 4a38861d06
commit 396d11aa45
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pr_agent/git_providers/bitbucket_provider.py
View File

@ -134,10 +134,13 @@ class BitbucketProvider(GitProvider):
if diffs != diffs_original: if diffs != diffs_original:
try: try:
names_original = [d.new.path for d in diffs_original] names_original = [d.new.path for d in diffs_original]
names_filtered = [d.new.path for d in diffs] names_kept = [d.new.path for d in diffs]
names_filtered = list(set(names_original) - set(names_kept))
get_logger().info(f"Filtered out [ignore] files for PR", extra={ get_logger().info(f"Filtered out [ignore] files for PR", extra={
'original_files': names_original, 'original_files': names_original,
'filtered_files': names_filtered 'names_kept': names_kept,
'names_filtered': names_filtered
}) })
except Exception as e: except Exception as e:
pass pass
@ -145,6 +148,9 @@ class BitbucketProvider(GitProvider):
# get the pr patches # get the pr patches
pr_patch = self.pr.diff() pr_patch = self.pr.diff()
diff_split = ["diff --git" + x for x in pr_patch.split("diff --git") if x.strip()] diff_split = ["diff --git" + x for x in pr_patch.split("diff --git") if x.strip()]
# filter all elements of 'diff_split' that are of indices in 'diffs_original' that are not in 'diffs'
if len(diff_split) > len(diffs) and len(diffs_original) == len(diff_split):
diff_split = [diff_split[i] for i in range(len(diff_split)) if diffs_original[i] in diffs]
if len(diff_split) != len(diffs): if len(diff_split) != len(diffs):
get_logger().error(f"Error - failed to split the diff into {len(diffs)} parts") get_logger().error(f"Error - failed to split the diff into {len(diffs)} parts")
return [] return []