Skip to content

PDP-919: Fix the merge issue #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SameeraPriyathamTadikonda merged 2 commits into from
Jan 22, 2026
Merged

PDP-919: Fix the merge issue #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d2ed5
PDP-919: Fix the merge issue
SameeraPriyathamTadikonda Jan 22, 2026
13d366d
Update github-app/app.py
SameeraPriyathamTadikonda Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions github-app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,18 @@ def get_changed_files(self):
raise Exception(f"Failed to get PR files: {resp.status_code}")
changed = []
for fd in resp.json():
if fd['status'] in ['added','modified']:
fn = fd['filename']
status = fd['status']
fn = fd['filename']
# Skip deleted/removed files - they don't exist in PR head
if status in ['removed', 'deleted']:
logger.info(f"Skipping deleted file: {fn}")
continue
# For added, modified, or renamed files, use the new filename
if status in ['added', 'modified', 'renamed']:
if not fn.startswith('.') or fn == '.copyrightconfig':
changed.append(fn)
else:
logger.warning(f"Unknown file status '{status}' for {fn}")
logger.info(f"Changed files: {len(changed)}")
return changed
except Exception as e:
Expand All @@ -308,10 +316,19 @@ def download_files(self, file_paths):
clone_res = subprocess.run(['git','clone','--depth','1','--branch', self.pr_data['base']['ref'], auth_clone_url, base_clone_dir], capture_output=True, text=True, timeout=60)
if clone_res.returncode != 0:
raise Exception(f"Git clone failed: {clone_res.stderr}")
apply_res = subprocess.run(['git','apply','--3way','--ignore-whitespace', diff_path], cwd=base_clone_dir, capture_output=True, text=True, timeout=30)
# First try normal apply for new files, then 3way for modifications
normal_apply_res = subprocess.run(['git','apply','--ignore-whitespace', diff_path], cwd=base_clone_dir, capture_output=True, text=True, timeout=30)
if normal_apply_res.returncode != 0:
logger.info(f"Normal git apply failed, trying --3way: {normal_apply_res.stderr[:200]}")
threeway_apply_res = subprocess.run(['git','apply','--3way','--ignore-whitespace', diff_path], cwd=base_clone_dir, capture_output=True, text=True, timeout=30)
apply_res = threeway_apply_res
else:
apply_res = normal_apply_res
stderr_lower = apply_res.stderr.lower()
applied_some = stderr_lower.count('applied patch') + stderr_lower.count('cleanly')
self.diff_applied = apply_res.returncode == 0 or applied_some > 0
if apply_res.returncode != 0:
logger.warning(f"Git apply stderr: {apply_res.stderr[:500]}")
downloaded = []
diff_content = diff_resp.text
for fp in file_paths:
Expand All @@ -325,7 +342,7 @@ def download_files(self, file_paths):
else:
self.files_from_base.append(fp)
else:
logger.warning(f"File not found: {fp}")
logger.warning(f"File not found after diff apply: {fp}")
return downloaded
except Exception as e:
logger.error(f"download_files error: {e}")
Expand Down