Skip to content

PDP-919: Get commits for a month #34

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 3 commits into from
Jan 22, 2026
Merged

PDP-919: Get commits for a month #34

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
435a144
PDP-919: get old commits for merge
SameeraPriyathamTadikonda Jan 22, 2026
acf5f2f
remove fallback logic
SameeraPriyathamTadikonda Jan 22, 2026
feb9e83
Add 30days
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
17 changes: 8 additions & 9 deletions github-app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,17 +313,16 @@ def download_files(self, file_paths):
base_clone_dir = os.path.join(self.temp_dir, 'base_repo')
token = self.headers['Authorization'].replace('token ','')
auth_clone_url = f"https://x-access-token:{token}@{GHES_URL.replace('https://','')}/{self.repo_full_name}.git"
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)
# Calculate date 30 days ago for consistent shallow clone across environments
from datetime import datetime, timedelta
thirty_days_ago = (datetime.now() - timedelta(days=30)).strftime('%Y-%m-%d')
clone_res = subprocess.run(['git','clone','--shallow-since', thirty_days_ago,'--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}")
# First try apply with whitespace fix, then 3way for modifications
normal_apply_res = subprocess.run(['git','apply','--whitespace=fix', diff_path], cwd=base_clone_dir, capture_output=True, text=True, timeout=30)
if normal_apply_res.returncode != 0:
logger.info(f"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
# Apply diff with 3-way merge and whitespace fix
apply_res = subprocess.run(['git','apply','--3way','--whitespace=fix', diff_path], cwd=base_clone_dir, capture_output=True, text=True, timeout=30)
if apply_res.returncode != 0:
logger.warning(f"Git apply failed: {apply_res.stderr[:500]}")
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
Expand Down