Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 500152510a | |||
| 0d5bfa9276 | |||
| eb2af77c90 | |||
| eccaa28b1d | |||
| 2101a43b68 | |||
| 9f0872c36a | |||
| d73da7cda9 |
+52
-24
@@ -56,6 +56,27 @@ def _req(method, path, data=None):
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def _req_safe(method, path, data=None):
|
||||
"""Like _req but returns None on HTTPError instead of crashing.
|
||||
Used for probing issue/PR existence where the caller can handle absence.
|
||||
"""
|
||||
url = f"{BASE}{path}"
|
||||
payload = json.dumps(data).encode("utf-8") if data else None
|
||||
req = urllib.request.Request(url, data=payload, method=method)
|
||||
req.add_header("Authorization", f"token {GITEA_TOKEN}")
|
||||
req.add_header("Content-Type", "application/json")
|
||||
try:
|
||||
with urllib.request.urlopen(req) as resp:
|
||||
raw = resp.read()
|
||||
if not raw:
|
||||
return {}
|
||||
return json.loads(raw)
|
||||
except urllib.error.HTTPError as e:
|
||||
body = e.read().decode()
|
||||
print(f"API Error {e.code}: {body}", file=sys.stderr)
|
||||
return None
|
||||
|
||||
|
||||
# ── Issue operations ─────────────────────────────────────────────────────────
|
||||
|
||||
def list_issues(labels: list[str] | None = None):
|
||||
@@ -82,17 +103,17 @@ def _get_blocking_refs(issue_num: int) -> set[int]:
|
||||
"""
|
||||
refs: set[int] = set()
|
||||
# Body
|
||||
issue = _req("GET", f"/issues/{issue_num}")
|
||||
issue = _req_safe("GET", f"/issues/{issue_num}")
|
||||
if issue is None:
|
||||
return refs # API error → return empty set, keep blocked
|
||||
body = issue.get("body", "") or ""
|
||||
refs.update(int(m.group(1)) for m in re.finditer(r'#(\d+)', body))
|
||||
# Comments
|
||||
try:
|
||||
comments = _req("GET", f"/issues/{issue_num}/comments")
|
||||
comments = _req_safe("GET", f"/issues/{issue_num}/comments")
|
||||
if comments:
|
||||
for c in comments:
|
||||
cbody = c.get("body", "") or ""
|
||||
refs.update(int(m.group(1)) for m in re.finditer(r'#(\d+)', cbody))
|
||||
except SystemExit:
|
||||
pass
|
||||
return refs
|
||||
|
||||
|
||||
@@ -103,12 +124,7 @@ def blocked_check():
|
||||
If no references found or all referenced issues are closed,
|
||||
removes the 'blocked' label.
|
||||
"""
|
||||
try:
|
||||
all_blocked = _req("GET", "/issues?state=open&labels=blocked")
|
||||
except SystemExit:
|
||||
print("No blocked issues found.")
|
||||
return
|
||||
|
||||
all_blocked = _req_safe("GET", "/issues?state=open&labels=blocked")
|
||||
if not all_blocked:
|
||||
print("No blocked issues found.")
|
||||
return
|
||||
@@ -119,13 +135,13 @@ def blocked_check():
|
||||
|
||||
all_resolved = True
|
||||
for blk in blocking_nums:
|
||||
try:
|
||||
blk_issue = _req("GET", f"/issues/{blk}")
|
||||
blk_issue = _req_safe("GET", f"/issues/{blk}")
|
||||
if blk_issue is None:
|
||||
all_resolved = False # API error → keep blocked
|
||||
break
|
||||
if blk_issue.get("state") != "closed":
|
||||
all_resolved = False
|
||||
break
|
||||
except SystemExit:
|
||||
pass
|
||||
|
||||
if all_resolved:
|
||||
current_label_names = [l["name"] for l in issue.get("labels", [])]
|
||||
@@ -172,6 +188,15 @@ def close_issue(num, body=None):
|
||||
return i
|
||||
|
||||
|
||||
def reopen_issue(num, body=None):
|
||||
"""Reopen a closed issue, optionally with a reason comment."""
|
||||
if body:
|
||||
comment_issue(num, f"## REOPEN\n\n{body}")
|
||||
i = _req("PATCH", f"/issues/{num}", {"state": "open"})
|
||||
print(f"Issue #{num} reopened")
|
||||
return i
|
||||
|
||||
|
||||
def _unblock_issues_blocked_by(closed_num):
|
||||
"""Check issues blocked by *closed_num* and unblock if all blockers resolved.
|
||||
|
||||
@@ -179,10 +204,7 @@ def _unblock_issues_blocked_by(closed_num):
|
||||
in any blocked issue and all referenced issues are now closed,
|
||||
removes the 'blocked' label and comments on the unblocked issue.
|
||||
"""
|
||||
try:
|
||||
all_blocked = _req("GET", "/issues?state=open&labels=blocked")
|
||||
except SystemExit:
|
||||
return
|
||||
all_blocked = _req_safe("GET", "/issues?state=open&labels=blocked")
|
||||
if not all_blocked:
|
||||
return
|
||||
|
||||
@@ -196,13 +218,13 @@ def _unblock_issues_blocked_by(closed_num):
|
||||
for blk in blocking_nums:
|
||||
if blk == closed_num:
|
||||
continue
|
||||
try:
|
||||
blk_issue = _req("GET", f"/issues/{blk}")
|
||||
blk_issue = _req_safe("GET", f"/issues/{blk}")
|
||||
if blk_issue is None:
|
||||
all_resolved = False # API error → keep blocked
|
||||
break
|
||||
if blk_issue.get("state") != "closed":
|
||||
all_resolved = False
|
||||
break
|
||||
except SystemExit:
|
||||
pass # Inaccessible → treat as resolved
|
||||
|
||||
if all_resolved:
|
||||
current_label_names = [l["name"] for l in issue.get("labels", [])]
|
||||
@@ -369,7 +391,8 @@ def main():
|
||||
parser = argparse.ArgumentParser(description="Dev agent Gitea helper")
|
||||
parser.add_argument("--action", required=True,
|
||||
choices=["list", "get", "comment", "close-issue",
|
||||
"create-issue", "create-pr", "pr-status", "merge-pr", "lifecycle",
|
||||
"create-issue", "reopen-issue",
|
||||
"create-pr", "pr-status", "merge-pr", "lifecycle",
|
||||
"blocked-check"])
|
||||
parser.add_argument("--issue", type=int)
|
||||
parser.add_argument("--pr", type=int)
|
||||
@@ -407,6 +430,11 @@ def main():
|
||||
print("--title is required for 'create-issue' action", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
create_issue(args.title, args.body, args.labels)
|
||||
elif args.action == "reopen-issue":
|
||||
if not args.issue:
|
||||
print("--issue is required for 'reopen-issue' action", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
reopen_issue(args.issue, args.body)
|
||||
elif args.action == "create-pr":
|
||||
if not args.issue or not args.branch:
|
||||
print("--issue and --branch are required for 'create-pr' action", file=sys.stderr)
|
||||
|
||||
Reference in New Issue
Block a user