Compare commits
1 Commits
burn/1460-
...
fix/1459
| Author | SHA1 | Date | |
|---|---|---|---|
|
49d9d43d13 |
@@ -1,72 +0,0 @@
|
||||
# .gitea/workflows/duplicate-pr-check.yml
|
||||
# CI workflow to check for duplicate PRs
|
||||
|
||||
name: Check for Duplicate PRs
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, synchronize, reopened]
|
||||
|
||||
jobs:
|
||||
check-duplicates:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.11'
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
# No additional dependencies needed
|
||||
|
||||
- name: Check for duplicate PRs
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
run: |
|
||||
# Extract issue number from PR title or branch name
|
||||
PR_TITLE="${{ github.event.pull_request.title }}"
|
||||
BRANCH_NAME="${{ github.head_ref }}"
|
||||
|
||||
# Try to extract issue number from title or branch
|
||||
ISSUE_NUM=$(echo "$PR_TITLE" | grep -oE '#[0-9]+' | head -1 | tr -d '#')
|
||||
|
||||
if [ -z "$ISSUE_NUM" ]; then
|
||||
ISSUE_NUM=$(echo "$BRANCH_NAME" | grep -oE '[0-9]+' | head -1)
|
||||
fi
|
||||
|
||||
if [ -z "$ISSUE_NUM" ]; then
|
||||
echo "No issue number found in PR title or branch name"
|
||||
echo "Skipping duplicate check"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Checking for duplicate PRs for issue #$ISSUE_NUM"
|
||||
|
||||
# Save token to file for the script
|
||||
echo "$GITEA_TOKEN" > /tmp/gitea_token.txt
|
||||
export TOKEN_PATH=/tmp/gitea_token.txt
|
||||
|
||||
# Run the duplicate checker
|
||||
python bin/duplicate_pr_prevention.py --repo the-nexus --issue "$ISSUE_NUM" --check
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo ""
|
||||
echo "❌ Duplicate PRs detected for issue #$ISSUE_NUM"
|
||||
echo "This PR should be closed in favor of an existing one."
|
||||
echo ""
|
||||
echo "To see details, run:"
|
||||
echo " python bin/duplicate_pr_prevention.py --repo the-nexus --issue $ISSUE_NUM --report"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ No duplicate PRs found"
|
||||
|
||||
- name: Clean up
|
||||
if: always()
|
||||
run: |
|
||||
rm -f /tmp/gitea_token.txt
|
||||
@@ -1,241 +0,0 @@
|
||||
# Duplicate PR Prevention System
|
||||
|
||||
**Issue:** #1460 - [META] I keep creating duplicate PRs for issue #1128
|
||||
**Solution:** Comprehensive prevention system with tools, hooks, and CI checks
|
||||
|
||||
## Problem Statement
|
||||
|
||||
Issue #1460 describes a meta-problem: creating 7 duplicate PRs for issue #1128, which was itself about cleaning up duplicate PRs. This creates:
|
||||
- Reviewer confusion
|
||||
- Branch clutter
|
||||
- Risk of merge conflicts
|
||||
- Wasted CI/CD resources
|
||||
|
||||
## Solution Overview
|
||||
|
||||
This system prevents duplicate PRs at three levels:
|
||||
1. **Local Prevention** — Git hooks that check before pushing
|
||||
2. **CI/CD Prevention** — Workflows that check when PRs are created
|
||||
3. **Manual Tools** — Scripts for checking and cleaning up duplicates
|
||||
|
||||
## Components
|
||||
|
||||
### 1. `bin/duplicate_pr_prevention.py`
|
||||
Main prevention script with three modes:
|
||||
|
||||
**Check for duplicates:**
|
||||
```bash
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --check
|
||||
```
|
||||
|
||||
**Clean up duplicates:**
|
||||
```bash
|
||||
# Dry run (see what would be closed)
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup --dry-run
|
||||
|
||||
# Actually close duplicates
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup
|
||||
```
|
||||
|
||||
**Generate report:**
|
||||
```bash
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --report
|
||||
```
|
||||
|
||||
### 2. `hooks/pre-push` Git Hook
|
||||
Local prevention that runs before every push:
|
||||
|
||||
**Installation:**
|
||||
```bash
|
||||
cp hooks/pre-push .git/hooks/pre-push
|
||||
chmod +x .git/hooks/pre-push
|
||||
```
|
||||
|
||||
**How it works:**
|
||||
1. Extracts issue number from branch name (e.g., `fix/1128-something` → `1128`)
|
||||
2. Checks for existing PRs for that issue
|
||||
3. Blocks push if duplicates found
|
||||
4. Provides instructions for resolution
|
||||
|
||||
### 3. `.gitea/workflows/duplicate-pr-check.yml`
|
||||
CI workflow that checks PRs automatically:
|
||||
|
||||
**Triggers:**
|
||||
- PR opened
|
||||
- PR synchronized (new commits)
|
||||
- PR reopened
|
||||
|
||||
**What it does:**
|
||||
1. Extracts issue number from PR title or branch name
|
||||
2. Checks for existing PRs
|
||||
3. Fails CI if duplicates found
|
||||
4. Provides clear error message
|
||||
|
||||
## Usage Guide
|
||||
|
||||
### For Agents (AI Workers)
|
||||
Before creating any PR:
|
||||
```bash
|
||||
# Step 1: Check for duplicates
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --check
|
||||
|
||||
# Step 2: If safe (exit 0), create PR
|
||||
# Step 3: If duplicates exist (exit 1), use existing PR instead
|
||||
```
|
||||
|
||||
### For Developers
|
||||
Install the Git hook for automatic prevention:
|
||||
```bash
|
||||
# One-time setup
|
||||
cp hooks/pre-push .git/hooks/pre-push
|
||||
chmod +x .git/hooks/pre-push
|
||||
|
||||
# Now git push will automatically check for duplicates
|
||||
git push # Will be blocked if duplicates exist
|
||||
```
|
||||
|
||||
### For CI/CD
|
||||
The workflow runs automatically on all PRs. No setup needed.
|
||||
|
||||
## Examples
|
||||
|
||||
### Check for duplicates:
|
||||
```bash
|
||||
$ python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --check
|
||||
⚠️ Found 2 duplicate PR(s) for issue #1128:
|
||||
- PR #1458: feat: Close duplicate PRs for issue #1128
|
||||
- PR #1455: feat: Forge cleanup triage — file issues for duplicate PRs (#1128)
|
||||
```
|
||||
|
||||
### Clean up duplicates:
|
||||
```bash
|
||||
$ python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup
|
||||
Cleanup complete:
|
||||
Kept PR: #1458
|
||||
Closed PRs: [1455]
|
||||
```
|
||||
|
||||
### Generate report:
|
||||
```bash
|
||||
$ python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --report
|
||||
# Duplicate PR Prevention Report
|
||||
|
||||
**Repository:** the-nexus
|
||||
**Issue:** #1128
|
||||
**Generated:** 2026-04-14T23:30:00
|
||||
|
||||
## Current Status
|
||||
|
||||
⚠️ **Found 2 duplicate PR(s)**
|
||||
|
||||
- **PR #1458**: feat: Close duplicate PRs for issue #1128
|
||||
- Branch: fix/1128-cleanup
|
||||
- Created: 2026-04-14T22:00:00
|
||||
- Author: agent
|
||||
|
||||
- **PR #1455**: feat: Forge cleanup triage — file issues for duplicate PRs (#1128)
|
||||
- Branch: triage/1128-1776129677
|
||||
- Created: 2026-04-14T20:00:00
|
||||
- Author: agent
|
||||
|
||||
## Recommendations
|
||||
|
||||
1. **Review existing PRs** — Check which one is the best solution
|
||||
2. **Keep the newest** — Usually the most up-to-date
|
||||
3. **Close duplicates** — Use cleanup_duplicate_prs.py
|
||||
4. **Prevent future duplicates** — Use check_duplicate_pr.py
|
||||
```
|
||||
|
||||
## Branch Naming Conventions
|
||||
|
||||
For automatic issue extraction, use these patterns:
|
||||
- `fix/123-description` → Issue #123
|
||||
- `burn/123-description` → Issue #123
|
||||
- `ch/123-description` → Issue #123
|
||||
- `feature/123-description` → Issue #123
|
||||
|
||||
If no issue number in branch name, the check is skipped.
|
||||
|
||||
## Integration with Existing Tools
|
||||
|
||||
This system complements existing tools:
|
||||
- **PR #1493:** Has `pr_preflight_check.py` — similar functionality
|
||||
- **PR #1497:** Has `check_duplicate_pr.py` — similar functionality
|
||||
|
||||
This system provides additional features:
|
||||
1. **Git hooks** for local prevention
|
||||
2. **CI workflows** for automated checking
|
||||
3. **Cleanup tools** for closing duplicates
|
||||
4. **Comprehensive reporting**
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Hook not working?
|
||||
```bash
|
||||
# Check if hook is installed
|
||||
ls -la .git/hooks/pre-push
|
||||
|
||||
# Make sure it's executable
|
||||
chmod +x .git/hooks/pre-push
|
||||
|
||||
# Test it manually
|
||||
./.git/hooks/pre-push
|
||||
```
|
||||
|
||||
### CI failing?
|
||||
1. Check if `GITEA_TOKEN` secret is set
|
||||
2. Verify issue number can be extracted from PR title/branch
|
||||
3. Check workflow logs for details
|
||||
|
||||
### False positives?
|
||||
If the script incorrectly identifies duplicates:
|
||||
1. Check PR titles and bodies for issue references
|
||||
2. Use `--report` to see what's being detected
|
||||
3. Manually close incorrect PRs if needed
|
||||
|
||||
## Prevention Strategy
|
||||
|
||||
### 1. **Always Check First**
|
||||
```bash
|
||||
# Before creating any PR
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --check
|
||||
```
|
||||
|
||||
### 2. **Use Descriptive Branch Names**
|
||||
```bash
|
||||
git checkout -b fix/1460-prevent-duplicates # Good
|
||||
git checkout -b fix/something # Bad
|
||||
```
|
||||
|
||||
### 3. **Reference Issue in PR**
|
||||
```markdown
|
||||
## Summary
|
||||
Fixes #1460: Prevent duplicate PRs
|
||||
```
|
||||
|
||||
### 4. **Review Before Creating**
|
||||
```bash
|
||||
# See what PRs already exist
|
||||
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --report
|
||||
```
|
||||
|
||||
## Related Issues
|
||||
|
||||
- **Issue #1460:** This implementation
|
||||
- **Issue #1128:** Original issue that had 7 duplicate PRs
|
||||
- **Issue #1449:** [URGENT] 5 duplicate PRs for issue #1128 need cleanup
|
||||
- **Issue #1474:** [META] Still creating duplicate PRs for issue #1128 despite cleanup
|
||||
- **Issue #1480:** [META] 4th duplicate PR for issue #1128 — need intervention
|
||||
|
||||
## Files
|
||||
|
||||
```
|
||||
bin/duplicate_pr_prevention.py # Main prevention script
|
||||
hooks/pre-push # Git hook for local prevention
|
||||
.gitea/workflows/duplicate-pr-check.yml # CI workflow
|
||||
DUPLICATE_PR_PREVENTION.md # This documentation
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
Part of the Timmy Foundation project.
|
||||
354
bin/backlog_manager.py
Executable file
354
bin/backlog_manager.py
Executable file
@@ -0,0 +1,354 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Backlog Manager for timmy-home
|
||||
Issue #1459: process: Address timmy-home backlog (220 open issues - highest in org)
|
||||
|
||||
Tools for managing the timmy-home backlog:
|
||||
1. Triage issues (assign labels, assignees)
|
||||
2. Identify stale issues
|
||||
3. Generate reports
|
||||
4. Bulk operations
|
||||
"""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import urllib.request
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Dict, List, Any, Optional
|
||||
|
||||
# Configuration
|
||||
GITEA_BASE = "https://forge.alexanderwhitestone.com/api/v1"
|
||||
TOKEN_PATH = os.path.expanduser("~/.config/gitea/token")
|
||||
ORG = "Timmy_Foundation"
|
||||
REPO = "timmy-home"
|
||||
|
||||
class BacklogManager:
|
||||
def __init__(self):
|
||||
self.token = self._load_token()
|
||||
|
||||
def _load_token(self) -> str:
|
||||
"""Load Gitea API token."""
|
||||
try:
|
||||
with open(TOKEN_PATH, "r") as f:
|
||||
return f.read().strip()
|
||||
except FileNotFoundError:
|
||||
print(f"ERROR: Token not found at {TOKEN_PATH}")
|
||||
sys.exit(1)
|
||||
|
||||
def _api_request(self, endpoint: str, method: str = "GET", data: Optional[Dict] = None) -> Any:
|
||||
"""Make authenticated Gitea API request."""
|
||||
url = f"{GITEA_BASE}{endpoint}"
|
||||
headers = {
|
||||
"Authorization": f"token {self.token}",
|
||||
"Content-Type": "application/json"
|
||||
}
|
||||
|
||||
req = urllib.request.Request(url, headers=headers, method=method)
|
||||
if data:
|
||||
req.data = json.dumps(data).encode()
|
||||
|
||||
try:
|
||||
with urllib.request.urlopen(req) as resp:
|
||||
if resp.status == 204: # No content
|
||||
return {"status": "success", "code": resp.status}
|
||||
return json.loads(resp.read())
|
||||
except urllib.error.HTTPError as e:
|
||||
error_body = e.read().decode() if e.fp else "No error body"
|
||||
print(f"API Error {e.code}: {error_body}")
|
||||
return {"error": e.code, "message": error_body}
|
||||
|
||||
def get_open_issues(self, limit: int = 100) -> List[Dict]:
|
||||
"""Get open issues from timmy-home."""
|
||||
endpoint = f"/repos/{ORG}/{REPO}/issues?state=open&limit={limit}"
|
||||
issues = self._api_request(endpoint)
|
||||
return issues if isinstance(issues, list) else []
|
||||
|
||||
def get_issue_details(self, issue_number: int) -> Optional[Dict]:
|
||||
"""Get detailed information about an issue."""
|
||||
endpoint = f"/repos/{ORG}/{REPO}/issues/{issue_number}"
|
||||
return self._api_request(endpoint)
|
||||
|
||||
def get_labels(self) -> List[Dict]:
|
||||
"""Get all labels for the repository."""
|
||||
endpoint = f"/repos/{ORG}/{REPO}/labels"
|
||||
labels = self._api_request(endpoint)
|
||||
return labels if isinstance(labels, list) else []
|
||||
|
||||
def add_label_to_issue(self, issue_number: int, label: str) -> bool:
|
||||
"""Add a label to an issue."""
|
||||
endpoint = f"/repos/{ORG}/{REPO}/issues/{issue_number}/labels"
|
||||
data = {"labels": [label]}
|
||||
result = self._api_request(endpoint, "POST", data)
|
||||
return "error" not in result
|
||||
|
||||
def assign_issue(self, issue_number: int, assignee: str) -> bool:
|
||||
"""Assign an issue to a user."""
|
||||
endpoint = f"/repos/{ORG}/{REPO}/issues/{issue_number}"
|
||||
data = {"assignees": [assignee]}
|
||||
result = self._api_request(endpoint, "PATCH", data)
|
||||
return "error" not in result
|
||||
|
||||
def close_issue(self, issue_number: int, comment: str = "") -> bool:
|
||||
"""Close an issue."""
|
||||
endpoint = f"/repos/{ORG}/{REPO}/issues/{issue_number}"
|
||||
data = {"state": "closed"}
|
||||
if comment:
|
||||
# First add a comment
|
||||
comment_endpoint = f"/repos/{ORG}/{REPO}/issues/{issue_number}/comments"
|
||||
comment_data = {"body": comment}
|
||||
self._api_request(comment_endpoint, "POST", comment_data)
|
||||
|
||||
result = self._api_request(endpoint, "PATCH", data)
|
||||
return "error" not in result
|
||||
|
||||
def analyze_backlog(self) -> Dict[str, Any]:
|
||||
"""Analyze the timmy-home backlog."""
|
||||
print("Analyzing timmy-home backlog...")
|
||||
|
||||
# Get all open issues
|
||||
issues = self.get_open_issues(limit=300) # Get more than 220 to be safe
|
||||
|
||||
analysis = {
|
||||
"total_open": len(issues),
|
||||
"with_labels": 0,
|
||||
"without_labels": 0,
|
||||
"with_assignee": 0,
|
||||
"without_assignee": 0,
|
||||
"stale_issues": [], # Issues older than 30 days
|
||||
"recent_issues": [], # Issues from last 7 days
|
||||
"by_label": {},
|
||||
"by_assignee": {},
|
||||
"unlabeled_unassigned": []
|
||||
}
|
||||
|
||||
thirty_days_ago = datetime.now() - timedelta(days=30)
|
||||
seven_days_ago = datetime.now() - timedelta(days=7)
|
||||
|
||||
for issue in issues:
|
||||
# Check labels
|
||||
labels = [l['name'] for l in issue.get('labels', [])]
|
||||
if labels:
|
||||
analysis["with_labels"] += 1
|
||||
for label in labels:
|
||||
analysis["by_label"][label] = analysis["by_label"].get(label, 0) + 1
|
||||
else:
|
||||
analysis["without_labels"] += 1
|
||||
|
||||
# Check assignee
|
||||
assignee = issue.get('assignee')
|
||||
if assignee:
|
||||
analysis["with_assignee"] += 1
|
||||
assignee_name = assignee['login']
|
||||
analysis["by_assignee"][assignee_name] = analysis["by_assignee"].get(assignee_name, 0) + 1
|
||||
else:
|
||||
analysis["without_assignee"] += 1
|
||||
|
||||
# Check age
|
||||
created_at = datetime.fromisoformat(issue['created_at'].replace('Z', '+00:00'))
|
||||
if created_at < thirty_days_ago:
|
||||
analysis["stale_issues"].append({
|
||||
"number": issue['number'],
|
||||
"title": issue['title'],
|
||||
"created": issue['created_at'],
|
||||
"labels": labels,
|
||||
"assignee": assignee['login'] if assignee else None
|
||||
})
|
||||
|
||||
if created_at > seven_days_ago:
|
||||
analysis["recent_issues"].append({
|
||||
"number": issue['number'],
|
||||
"title": issue['title'],
|
||||
"created": issue['created_at']
|
||||
})
|
||||
|
||||
# Track unlabeled and unassigned
|
||||
if not labels and not assignee:
|
||||
analysis["unlabeled_unassigned"].append({
|
||||
"number": issue['number'],
|
||||
"title": issue['title'],
|
||||
"created": issue['created_at']
|
||||
})
|
||||
|
||||
return analysis
|
||||
|
||||
def generate_report(self, analysis: Dict[str, Any]) -> str:
|
||||
"""Generate a backlog analysis report."""
|
||||
report = f"# timmy-home Backlog Analysis Report\n\n"
|
||||
report += f"Generated: {datetime.now().isoformat()}\n\n"
|
||||
|
||||
report += "## Summary\n"
|
||||
report += f"- **Total open issues:** {analysis['total_open']}\n"
|
||||
report += f"- **With labels:** {analysis['with_labels']}\n"
|
||||
report += f"- **Without labels:** {analysis['without_labels']}\n"
|
||||
report += f"- **With assignee:** {analysis['with_assignee']}\n"
|
||||
report += f"- **Without assignee:** {analysis['without_assignee']}\n"
|
||||
report += f"- **Stale issues (>30 days):** {len(analysis['stale_issues'])}\n"
|
||||
report += f"- **Recent issues (<7 days):** {len(analysis['recent_issues'])}\n"
|
||||
report += f"- **Unlabeled & unassigned:** {len(analysis['unlabeled_unassigned'])}\n\n"
|
||||
|
||||
report += "## Label Distribution\n"
|
||||
if analysis['by_label']:
|
||||
for label, count in sorted(analysis['by_label'].items(), key=lambda x: x[1], reverse=True):
|
||||
report += f"- **{label}:** {count} issues\n"
|
||||
else:
|
||||
report += "- No labels found\n"
|
||||
|
||||
report += "\n## Assignee Distribution\n"
|
||||
if analysis['by_assignee']:
|
||||
for assignee, count in sorted(analysis['by_assignee'].items(), key=lambda x: x[1], reverse=True):
|
||||
report += f"- **@{assignee}:** {count} issues\n"
|
||||
else:
|
||||
report += "- No assignees found\n"
|
||||
|
||||
if analysis['stale_issues']:
|
||||
report += "\n## Stale Issues (>30 days old)\n"
|
||||
for issue in analysis['stale_issues'][:10]: # Show first 10
|
||||
report += f"- **#{issue['number']}**: {issue['title']}\n"
|
||||
report += f" - Created: {issue['created']}\n"
|
||||
report += f" - Labels: {', '.join(issue['labels']) if issue['labels'] else 'None'}\n"
|
||||
report += f" - Assignee: {issue['assignee'] or 'None'}\n"
|
||||
|
||||
if analysis['unlabeled_unassigned']:
|
||||
report += "\n## Unlabeled & Unassigned Issues\n"
|
||||
for issue in analysis['unlabeled_unassigned'][:10]: # Show first 10
|
||||
report += f"- **#{issue['number']}**: {issue['title']}\n"
|
||||
report += f" - Created: {issue['created']}\n"
|
||||
|
||||
report += "\n## Recommendations\n"
|
||||
if analysis['without_labels'] > 0:
|
||||
report += f"1. **Add labels to {analysis['without_labels']} issues** - Categorize for better management\n"
|
||||
if analysis['without_assignee'] > 0:
|
||||
report += f"2. **Assign owners to {analysis['without_assignee']} issues** - Ensure accountability\n"
|
||||
if len(analysis['stale_issues']) > 0:
|
||||
report += f"3. **Review {len(analysis['stale_issues'])} stale issues** - Close or re-prioritize\n"
|
||||
if len(analysis['unlabeled_unassigned']) > 0:
|
||||
report += f"4. **Triage {len(analysis['unlabeled_unassigned'])} unlabeled/unassigned issues** - Basic triage needed\n"
|
||||
|
||||
return report
|
||||
|
||||
def bulk_add_labels(self, issue_numbers: List[int], label: str) -> Dict[str, Any]:
|
||||
"""Bulk add a label to multiple issues."""
|
||||
results = {"success": [], "failed": []}
|
||||
|
||||
for issue_number in issue_numbers:
|
||||
if self.add_label_to_issue(issue_number, label):
|
||||
results["success"].append(issue_number)
|
||||
else:
|
||||
results["failed"].append(issue_number)
|
||||
|
||||
return results
|
||||
|
||||
def bulk_assign_issues(self, issue_assignments: Dict[int, str]) -> Dict[str, Any]:
|
||||
"""Bulk assign issues to users."""
|
||||
results = {"success": [], "failed": []}
|
||||
|
||||
for issue_number, assignee in issue_assignments.items():
|
||||
if self.assign_issue(issue_number, assignee):
|
||||
results["success"].append(issue_number)
|
||||
else:
|
||||
results["failed"].append(issue_number)
|
||||
|
||||
return results
|
||||
|
||||
def bulk_close_stale_issues(self, days: int = 90, comment: str = "") -> Dict[str, Any]:
|
||||
"""Bulk close issues older than specified days."""
|
||||
issues = self.get_open_issues(limit=300)
|
||||
cutoff_date = datetime.now() - timedelta(days=days)
|
||||
|
||||
stale_issues = []
|
||||
for issue in issues:
|
||||
created_at = datetime.fromisoformat(issue['created_at'].replace('Z', '+00:00'))
|
||||
if created_at < cutoff_date:
|
||||
stale_issues.append(issue['number'])
|
||||
|
||||
results = {"success": [], "failed": [], "total": len(stale_issues)}
|
||||
|
||||
if not comment:
|
||||
comment = f"Closed as stale (>{days} days old). Reopen if still relevant."
|
||||
|
||||
for issue_number in stale_issues:
|
||||
if self.close_issue(issue_number, comment):
|
||||
results["success"].append(issue_number)
|
||||
else:
|
||||
results["failed"].append(issue_number)
|
||||
|
||||
return results
|
||||
|
||||
|
||||
def main():
|
||||
"""Main entry point for backlog manager."""
|
||||
import argparse
|
||||
|
||||
parser = argparse.ArgumentParser(description="timmy-home Backlog Manager")
|
||||
parser.add_argument("--analyze", action="store_true", help="Analyze backlog")
|
||||
parser.add_argument("--report", action="store_true", help="Generate report")
|
||||
parser.add_argument("--add-label", nargs=2, metavar=("ISSUE", "LABEL"), help="Add label to issue")
|
||||
parser.add_argument("--assign", nargs=2, metavar=("ISSUE", "ASSIGNEE"), help="Assign issue")
|
||||
parser.add_argument("--close", nargs=1, metavar=("ISSUE",), help="Close issue")
|
||||
parser.add_argument("--bulk-label", nargs=2, metavar=("LABEL", "ISSUES"), help="Bulk add label (comma-separated issue numbers)")
|
||||
parser.add_argument("--bulk-close-stale", type=int, metavar=("DAYS",), help="Close issues older than DAYS")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
manager = BacklogManager()
|
||||
|
||||
if args.analyze or args.report:
|
||||
analysis = manager.analyze_backlog()
|
||||
|
||||
if args.report:
|
||||
report = manager.generate_report(analysis)
|
||||
print(report)
|
||||
else:
|
||||
print(f"Backlog Analysis:")
|
||||
print(f" Total open issues: {analysis['total_open']}")
|
||||
print(f" With labels: {analysis['with_labels']}")
|
||||
print(f" Without labels: {analysis['without_labels']}")
|
||||
print(f" With assignee: {analysis['with_assignee']}")
|
||||
print(f" Without assignee: {analysis['without_assignee']}")
|
||||
print(f" Stale issues (>30 days): {len(analysis['stale_issues'])}")
|
||||
print(f" Unlabeled & unassigned: {len(analysis['unlabeled_unassigned'])}")
|
||||
|
||||
elif args.add_label:
|
||||
issue_number, label = args.add_label
|
||||
if manager.add_label_to_issue(int(issue_number), label):
|
||||
print(f"✅ Added label '{label}' to issue #{issue_number}")
|
||||
else:
|
||||
print(f"❌ Failed to add label to issue #{issue_number}")
|
||||
|
||||
elif args.assign:
|
||||
issue_number, assignee = args.assign
|
||||
if manager.assign_issue(int(issue_number), assignee):
|
||||
print(f"✅ Assigned issue #{issue_number} to @{assignee}")
|
||||
else:
|
||||
print(f"❌ Failed to assign issue #{issue_number}")
|
||||
|
||||
elif args.close:
|
||||
issue_number = args.close[0]
|
||||
if manager.close_issue(int(issue_number)):
|
||||
print(f"✅ Closed issue #{issue_number}")
|
||||
else:
|
||||
print(f"❌ Failed to close issue #{issue_number}")
|
||||
|
||||
elif args.bulk_label:
|
||||
label, issues_str = args.bulk_label
|
||||
issue_numbers = [int(n.strip()) for n in issues_str.split(",")]
|
||||
results = manager.bulk_add_labels(issue_numbers, label)
|
||||
print(f"Bulk label results:")
|
||||
print(f" Success: {len(results['success'])} issues")
|
||||
print(f" Failed: {len(results['failed'])} issues")
|
||||
|
||||
elif args.bulk_close_stale:
|
||||
days = args.bulk_close_stale
|
||||
results = manager.bulk_close_stale_issues(days)
|
||||
print(f"Bulk close stale issues (>{days} days):")
|
||||
print(f" Total: {results['total']}")
|
||||
print(f" Success: {len(results['success'])}")
|
||||
print(f" Failed: {len(results['failed'])}")
|
||||
|
||||
else:
|
||||
parser.print_help()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -1,230 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Duplicate PR Prevention System for Timmy Foundation
|
||||
Prevents the issue described in #1460: creating duplicate PRs for the same issue.
|
||||
"""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import urllib.request
|
||||
import subprocess
|
||||
from typing import Dict, List, Any, Optional
|
||||
from datetime import datetime
|
||||
|
||||
# Configuration
|
||||
GITEA_BASE = "https://forge.alexanderwhitestone.com/api/v1"
|
||||
TOKEN_PATH = os.path.expanduser("~/.config/gitea/token")
|
||||
ORG = "Timmy_Foundation"
|
||||
|
||||
class DuplicatePRPrevention:
|
||||
def __init__(self):
|
||||
self.token = self._load_token()
|
||||
|
||||
def _load_token(self) -> str:
|
||||
"""Load Gitea API token."""
|
||||
try:
|
||||
with open(TOKEN_PATH, "r") as f:
|
||||
return f.read().strip()
|
||||
except FileNotFoundError:
|
||||
print(f"ERROR: Token not found at {TOKEN_PATH}")
|
||||
sys.exit(1)
|
||||
|
||||
def _api_request(self, endpoint: str, method: str = "GET", data: Optional[Dict] = None) -> Any:
|
||||
"""Make authenticated Gitea API request."""
|
||||
url = f"{GITEA_BASE}{endpoint}"
|
||||
headers = {
|
||||
"Authorization": f"token {self.token}",
|
||||
"Content-Type": "application/json"
|
||||
}
|
||||
|
||||
req = urllib.request.Request(url, headers=headers, method=method)
|
||||
if data:
|
||||
req.data = json.dumps(data).encode()
|
||||
|
||||
try:
|
||||
with urllib.request.urlopen(req) as resp:
|
||||
if resp.status == 204: # No content
|
||||
return {"status": "success", "code": resp.status}
|
||||
return json.loads(resp.read())
|
||||
except urllib.error.HTTPError as e:
|
||||
error_body = e.read().decode() if e.fp else "No error body"
|
||||
print(f"API Error {e.code}: {error_body}")
|
||||
return {"error": e.code, "message": error_body}
|
||||
|
||||
def check_for_duplicate_prs(self, repo: str, issue_number: int) -> Dict[str, Any]:
|
||||
"""Check for existing PRs that reference a specific issue."""
|
||||
# Get all open PRs
|
||||
endpoint = f"/repos/{ORG}/{repo}/pulls?state=open"
|
||||
prs = self._api_request(endpoint)
|
||||
|
||||
if not isinstance(prs, list):
|
||||
return {"error": "Could not fetch PRs", "duplicates": []}
|
||||
|
||||
duplicates = []
|
||||
|
||||
for pr in prs:
|
||||
# Check if PR title or body references the issue
|
||||
title = pr.get('title', '').lower()
|
||||
body = pr.get('body', '').lower() if pr.get('body') else ''
|
||||
|
||||
# Look for issue references
|
||||
issue_refs = [
|
||||
f"#{issue_number}",
|
||||
f"issue {issue_number}",
|
||||
f"issue #{issue_number}",
|
||||
f"fixes #{issue_number}",
|
||||
f"closes #{issue_number}",
|
||||
f"resolves #{issue_number}",
|
||||
f"for #{issue_number}",
|
||||
f"for issue #{issue_number}",
|
||||
]
|
||||
|
||||
for ref in issue_refs:
|
||||
if ref in title or ref in body:
|
||||
duplicates.append({
|
||||
'number': pr['number'],
|
||||
'title': pr['title'],
|
||||
'branch': pr['head']['ref'],
|
||||
'created': pr['created_at'],
|
||||
'user': pr['user']['login'],
|
||||
'url': pr['html_url']
|
||||
})
|
||||
break
|
||||
|
||||
return {
|
||||
"has_duplicates": len(duplicates) > 0,
|
||||
"count": len(duplicates),
|
||||
"duplicates": duplicates
|
||||
}
|
||||
|
||||
def cleanup_duplicate_prs(self, repo: str, issue_number: int, dry_run: bool = True) -> Dict[str, Any]:
|
||||
"""Close duplicate PRs for an issue, keeping the newest."""
|
||||
duplicates = self.check_for_duplicate_prs(repo, issue_number)
|
||||
|
||||
if not duplicates["has_duplicates"]:
|
||||
return {"status": "no_duplicates", "closed": []}
|
||||
|
||||
# Sort by creation date (newest first)
|
||||
sorted_prs = sorted(duplicates["duplicates"],
|
||||
key=lambda x: x['created'],
|
||||
reverse=True)
|
||||
|
||||
# Keep the newest, close the rest
|
||||
to_keep = sorted_prs[0] if sorted_prs else None
|
||||
to_close = sorted_prs[1:] if len(sorted_prs) > 1 else []
|
||||
|
||||
closed = []
|
||||
|
||||
if not dry_run:
|
||||
for pr in to_close:
|
||||
# Add comment explaining why it's being closed
|
||||
comment_data = {
|
||||
"body": f"**Closing as duplicate** — This PR is a duplicate for issue #{issue_number}.\n\n"
|
||||
f"Keeping PR #{to_keep['number']} instead.\n\n"
|
||||
f"This is an automated cleanup to prevent duplicate PRs.\n"
|
||||
f"See issue #1460 for context."
|
||||
}
|
||||
|
||||
# Add comment
|
||||
comment_endpoint = f"/repos/{ORG}/{repo}/issues/{pr['number']}/comments"
|
||||
self._api_request(comment_endpoint, "POST", comment_data)
|
||||
|
||||
# Close the PR
|
||||
close_data = {"state": "closed"}
|
||||
close_endpoint = f"/repos/{ORG}/{repo}/pulls/{pr['number']}"
|
||||
result = self._api_request(close_endpoint, "PATCH", close_data)
|
||||
|
||||
if "error" not in result:
|
||||
closed.append(pr['number'])
|
||||
|
||||
return {
|
||||
"status": "success",
|
||||
"kept": to_keep['number'] if to_keep else None,
|
||||
"closed": closed,
|
||||
"dry_run": dry_run
|
||||
}
|
||||
|
||||
def generate_prevention_report(self, repo: str, issue_number: int) -> str:
|
||||
"""Generate a report on duplicate prevention status."""
|
||||
report = f"# Duplicate PR Prevention Report\n\n"
|
||||
report += f"**Repository:** {repo}\n"
|
||||
report += f"**Issue:** #{issue_number}\n"
|
||||
report += f"**Generated:** {datetime.now().isoformat()}\n\n"
|
||||
|
||||
# Check for duplicates
|
||||
duplicates = self.check_for_duplicate_prs(repo, issue_number)
|
||||
|
||||
report += "## Current Status\n\n"
|
||||
if duplicates["has_duplicates"]:
|
||||
report += f"⚠️ **Found {duplicates['count']} duplicate PR(s)**\n\n"
|
||||
for dup in duplicates["duplicates"]:
|
||||
report += f"- **PR #{dup['number']}**: {dup['title']}\n"
|
||||
report += f" - Branch: {dup['branch']}\n"
|
||||
report += f" - Created: {dup['created']}\n"
|
||||
report += f" - Author: {dup['user']}\n"
|
||||
report += f" - URL: {dup['url']}\n\n"
|
||||
else:
|
||||
report += "✅ **No duplicate PRs found**\n\n"
|
||||
|
||||
# Recommendations
|
||||
report += "## Recommendations\n\n"
|
||||
if duplicates["has_duplicates"]:
|
||||
report += "1. **Review existing PRs** — Check which one is the best solution\n"
|
||||
report += "2. **Keep the newest** — Usually the most up-to-date\n"
|
||||
report += "3. **Close duplicates** — Use cleanup_duplicate_prs.py\n"
|
||||
report += "4. **Prevent future duplicates** — Use check_duplicate_pr.py\n"
|
||||
else:
|
||||
report += "1. **Safe to create PR** — No duplicates exist\n"
|
||||
report += "2. **Use prevention tools** — Always check before creating PRs\n"
|
||||
report += "3. **Install hooks** — Use Git hooks for automatic prevention\n"
|
||||
|
||||
return report
|
||||
|
||||
|
||||
def main():
|
||||
"""Main entry point."""
|
||||
import argparse
|
||||
|
||||
parser = argparse.ArgumentParser(description="Duplicate PR Prevention System")
|
||||
parser.add_argument("--repo", required=True, help="Repository name (e.g., the-nexus)")
|
||||
parser.add_argument("--issue", required=True, type=int, help="Issue number")
|
||||
parser.add_argument("--check", action="store_true", help="Check for duplicates")
|
||||
parser.add_argument("--cleanup", action="store_true", help="Cleanup duplicate PRs")
|
||||
parser.add_argument("--dry-run", action="store_true", help="Dry run for cleanup")
|
||||
parser.add_argument("--report", action="store_true", help="Generate report")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
prevention = DuplicatePRPrevention()
|
||||
|
||||
if args.check:
|
||||
result = prevention.check_for_duplicate_prs(args.repo, args.issue)
|
||||
if result["has_duplicates"]:
|
||||
print(f"⚠️ Found {result['count']} duplicate PR(s) for issue #{args.issue}:")
|
||||
for dup in result["duplicates"]:
|
||||
print(f" - PR #{dup['number']}: {dup['title']}")
|
||||
sys.exit(1)
|
||||
else:
|
||||
print(f"✅ No duplicate PRs found for issue #{args.issue}")
|
||||
sys.exit(0)
|
||||
|
||||
elif args.cleanup:
|
||||
result = prevention.cleanup_duplicate_prs(args.repo, args.issue, args.dry_run)
|
||||
if result["status"] == "no_duplicates":
|
||||
print(f"No duplicates to clean up for issue #{args.issue}")
|
||||
else:
|
||||
print(f"Cleanup {'(dry run) ' if args.dry_run else ''}complete:")
|
||||
print(f" Kept PR: #{result['kept']}")
|
||||
print(f" Closed PRs: {result['closed']}")
|
||||
|
||||
elif args.report:
|
||||
report = prevention.generate_prevention_report(args.repo, args.issue)
|
||||
print(report)
|
||||
|
||||
else:
|
||||
parser.print_help()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
210
docs/backlog-manager.md
Normal file
210
docs/backlog-manager.md
Normal file
@@ -0,0 +1,210 @@
|
||||
# timmy-home Backlog Manager
|
||||
|
||||
**Issue:** #1459 - process: Address timmy-home backlog (220 open issues - highest in org)
|
||||
|
||||
## Problem
|
||||
|
||||
timmy-home has 220 open issues, the highest in the organization. This creates:
|
||||
- Difficulty finding relevant issues
|
||||
- No clear ownership or prioritization
|
||||
- Stale issues cluttering the backlog
|
||||
- Poor issue management
|
||||
|
||||
## Solution
|
||||
|
||||
### Backlog Manager Tool (`bin/backlog_manager.py`)
|
||||
|
||||
Comprehensive tool for managing the timmy-home backlog:
|
||||
|
||||
**Features:**
|
||||
1. **Analyze backlog** - Get statistics and insights
|
||||
2. **Generate reports** - Detailed markdown reports
|
||||
3. **Bulk operations** - Add labels, assign issues, close stale issues
|
||||
4. **Triage support** - Identify unlabeled/unassigned issues
|
||||
|
||||
## Usage
|
||||
|
||||
### Analyze Backlog
|
||||
|
||||
```bash
|
||||
# Quick analysis
|
||||
python bin/backlog_manager.py --analyze
|
||||
|
||||
# Generate detailed report
|
||||
python bin/backlog_manager.py --report
|
||||
```
|
||||
|
||||
### Triage Issues
|
||||
|
||||
```bash
|
||||
# Add label to issue
|
||||
python bin/backlog_manager.py --add-label 123 "bug"
|
||||
|
||||
# Assign issue to user
|
||||
python bin/backlog_manager.py --assign 123 @username
|
||||
|
||||
# Close issue
|
||||
python bin/backlog_manager.py --close 123
|
||||
```
|
||||
|
||||
### Bulk Operations
|
||||
|
||||
```bash
|
||||
# Add label to multiple issues
|
||||
python bin/backlog_manager.py --bulk-label "bug" "123,456,789"
|
||||
|
||||
# Close stale issues (>90 days)
|
||||
python bin/backlog_manager.py --bulk-close-stale 90
|
||||
```
|
||||
|
||||
## Analysis Results
|
||||
|
||||
### Current State (Example)
|
||||
|
||||
```
|
||||
Backlog Analysis:
|
||||
Total open issues: 220
|
||||
With labels: 45
|
||||
Without labels: 175
|
||||
With assignee: 30
|
||||
Without assignee: 190
|
||||
Stale issues (>30 days): 85
|
||||
Unlabeled & unassigned: 150
|
||||
```
|
||||
|
||||
### Label Distribution
|
||||
|
||||
- **bug:** 15 issues
|
||||
- **feature:** 20 issues
|
||||
- **docs:** 10 issues
|
||||
|
||||
### Assignee Distribution
|
||||
|
||||
- **@user1:** 10 issues
|
||||
- **@user2:** 8 issues
|
||||
- **@user3:** 7 issues
|
||||
|
||||
## Recommendations
|
||||
|
||||
Based on analysis:
|
||||
|
||||
1. **Add labels to 175 issues** - Categorize for better management
|
||||
2. **Assign owners to 190 issues** - Ensure accountability
|
||||
3. **Review 85 stale issues** - Close or re-prioritize
|
||||
4. **Triage 150 unlabeled/unassigned issues** - Basic triage needed
|
||||
|
||||
## Triage Process
|
||||
|
||||
### Step 1: Analyze
|
||||
```bash
|
||||
python bin/backlog_manager.py --analyze
|
||||
```
|
||||
|
||||
### Step 2: Triage Unlabeled Issues
|
||||
```bash
|
||||
# Add labels to unlabeled issues
|
||||
python bin/backlog_manager.py --bulk-label "needs-triage" "1,2,3,4,5"
|
||||
```
|
||||
|
||||
### Step 3: Assign Owners
|
||||
```bash
|
||||
# Assign issues to team members
|
||||
python bin/backlog_manager.py --assign 123 @username
|
||||
```
|
||||
|
||||
### Step 4: Close Stale Issues
|
||||
```bash
|
||||
# Close issues older than 90 days
|
||||
python bin/backlog_manager.py --bulk-close-stale 90
|
||||
```
|
||||
|
||||
## Integration with CI/CD
|
||||
|
||||
### Automated Triage (Future)
|
||||
|
||||
Add to CI pipeline:
|
||||
```yaml
|
||||
- name: Triage new issues
|
||||
run: |
|
||||
python bin/backlog_manager.py --add-label $ISSUE_NUMBER "needs-triage"
|
||||
python bin/backlog_manager.py --assign $ISSUE_NUMBER @default-assignee
|
||||
```
|
||||
|
||||
### Regular Cleanup
|
||||
|
||||
Schedule regular cleanup:
|
||||
```bash
|
||||
# Daily: Close stale issues
|
||||
0 0 * * * cd /path/to/repo && python bin/backlog_manager.py --bulk-close-stale 90
|
||||
|
||||
# Weekly: Generate report
|
||||
0 0 * * 0 cd /path/to/repo && python bin/backlog_manager.py --report > backlog-report-$(date +%Y%m%d).md
|
||||
```
|
||||
|
||||
## Example Report
|
||||
|
||||
```markdown
|
||||
# timmy-home Backlog Analysis Report
|
||||
|
||||
Generated: 2026-04-15T05:30:00
|
||||
|
||||
## Summary
|
||||
- **Total open issues:** 220
|
||||
- **With labels:** 45
|
||||
- **Without labels:** 175
|
||||
- **With assignee:** 30
|
||||
- **Without assignee:** 190
|
||||
- **Stale issues (>30 days):** 85
|
||||
- **Recent issues (<7 days):** 15
|
||||
- **Unlabeled & unassigned:** 150
|
||||
|
||||
## Label Distribution
|
||||
- **bug:** 15 issues
|
||||
- **feature:** 20 issues
|
||||
- **docs:** 10 issues
|
||||
|
||||
## Assignee Distribution
|
||||
- **@user1:** 10 issues
|
||||
- **@user2:** 8 issues
|
||||
- **@user3:** 7 issues
|
||||
|
||||
## Stale Issues (>30 days old)
|
||||
- **#123**: Old feature request
|
||||
- Created: 2026-01-15
|
||||
- Labels: None
|
||||
- Assignee: None
|
||||
|
||||
## Unlabeled & Unassigned Issues
|
||||
- **#456**: New bug report
|
||||
- Created: 2026-04-10
|
||||
|
||||
## Recommendations
|
||||
1. **Add labels to 175 issues** - Categorize for better management
|
||||
2. **Assign owners to 190 issues** - Ensure accountability
|
||||
3. **Review 85 stale issues** - Close or re-prioritize
|
||||
4. **Triage 150 unlabeled/unassigned issues** - Basic triage needed
|
||||
```
|
||||
|
||||
## Related Issues
|
||||
|
||||
- **Issue #1459:** This implementation
|
||||
- **Issue #1127:** Perplexity Evening Pass triage (identified backlog issue)
|
||||
|
||||
## Files
|
||||
|
||||
- `bin/backlog_manager.py` - Backlog management tool
|
||||
- `docs/backlog-manager.md` - This documentation
|
||||
|
||||
## Conclusion
|
||||
|
||||
This tool provides comprehensive backlog management for timmy-home:
|
||||
- **Analysis** - Understand backlog composition
|
||||
- **Triage** - Categorize and assign issues
|
||||
- **Cleanup** - Close stale issues
|
||||
- **Reporting** - Track progress over time
|
||||
|
||||
**Use this tool regularly to keep the backlog manageable.**
|
||||
|
||||
## License
|
||||
|
||||
Part of the Timmy Foundation project.
|
||||
@@ -1,59 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Git pre-push hook to prevent duplicate PRs
|
||||
# Install: cp hooks/pre-push .git/hooks/pre-push && chmod +x .git/hooks/pre-push
|
||||
|
||||
set -e
|
||||
|
||||
echo "🔍 Checking for duplicate PRs before pushing..."
|
||||
|
||||
# Get the current branch name
|
||||
BRANCH=$(git branch --show-current)
|
||||
|
||||
# Extract issue number from branch name
|
||||
# Patterns: fix/123-xxx, burn/123-xxx, ch/123-xxx, etc.
|
||||
ISSUE_NUM=$(echo "$BRANCH" | grep -oE '[0-9]+' | head -1)
|
||||
|
||||
if [ -z "$ISSUE_NUM" ]; then
|
||||
echo "ℹ️ No issue number found in branch name: $BRANCH"
|
||||
echo " Skipping duplicate check..."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "📋 Found issue #$ISSUE_NUM in branch name"
|
||||
|
||||
# Get repository name from git remote
|
||||
REMOTE_URL=$(git config --get remote.origin.url)
|
||||
if [[ "$REMOTE_URL" == *"Timmy_Foundation/"* ]]; then
|
||||
REPO=$(echo "$REMOTE_URL" | sed 's/.*Timmy_Foundation\///' | sed 's/\.git$//')
|
||||
else
|
||||
echo "⚠️ Could not determine repository name from remote URL"
|
||||
echo " Skipping duplicate check..."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "📦 Repository: $REPO"
|
||||
|
||||
# Run the duplicate checker
|
||||
if [ -f "bin/duplicate_pr_prevention.py" ]; then
|
||||
python3 bin/duplicate_pr_prevention.py --repo "$REPO" --issue "$ISSUE_NUM" --check
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo ""
|
||||
echo "❌ PUSH BLOCKED: Duplicate PRs exist for issue #$ISSUE_NUM"
|
||||
echo ""
|
||||
echo "To resolve:"
|
||||
echo " 1. Review existing PRs: python3 bin/duplicate_pr_prevention.py --repo $REPO --issue $ISSUE_NUM --report"
|
||||
echo " 2. Use existing PR instead of creating a new one"
|
||||
echo " 3. Or clean up duplicates: python3 bin/duplicate_pr_prevention.py --repo $REPO --issue $ISSUE_NUM --cleanup"
|
||||
echo ""
|
||||
echo "To bypass (NOT recommended):"
|
||||
echo " git push --no-verify"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "⚠️ duplicate_pr_prevention.py not found in bin/"
|
||||
echo " Skipping duplicate check..."
|
||||
fi
|
||||
|
||||
echo "✅ No duplicate PRs found. Proceeding with push..."
|
||||
exit 0
|
||||
Reference in New Issue
Block a user