1
0
mirror of https://github.com/openSUSE/osc.git synced 2026-02-21 19:25:28 +01:00
Files
github.com_openSUSE_osc/osc/commands_git/pr_create.py
Antonello Tartamo 8092d579bd git-obs: Add --separate-requests and --dry-run to pr create
This introduces the ability to create multiple pull requests at once for
projects managing multiple packages.

Key changes:
- `pr create --separate-requests`: Automatically discovers packages using
  `_manifest` (if present) or top-level directories. It iterates through
  them and creates a PR for each if changes are detected.
- `pr create --dry-run`: Allows previewing the operations (source/target
  details, title, description) without actually creating the pull request
  on the server.
- Refactored `pr create` logic to separate argument parsing from the
  creation action, enabling reuse for the batch operation.
- Improved handling of "detached HEAD" state in `gitea_api.Git`:
  `current_branch` now returns `None` instead of an empty string, and
  the command raises a helpful error message instead of failing on an
  empty string check.
- Added early exit optimization for local packages that match the target
  commit.
2026-02-08 19:01:54 +01:00

290 lines
11 KiB
Python

import os
import re
import sys
import osc.commandline_git
NEW_PULL_REQUEST_TEMPLATE = """
# title
{title}
# description
{description}
#
# Please enter pull request title and description in the following format:
# <title>
# <blank line>
# <description>
#
# Lines starting with '#' will be ignored, and an empty message aborts the operation.
#
# Creating {source_owner}/{source_repo}#{source_branch} -> {target_owner}/{target_repo}#{target_branch}
#
{git_status}
#
# Commits:
{git_commits}
""".lstrip()
class PullRequestCreateCommand(osc.commandline_git.GitObsCommand):
"""
Create a pull request
"""
name = "create"
parent = "PullRequestCommand"
def init_arguments(self):
self.add_argument(
"--title",
metavar="TEXT",
help="Pull request title",
)
self.add_argument(
"--description",
metavar="TEXT",
help="Pull request description (body)",
)
self.add_argument(
"--source-owner",
metavar="OWNER",
help="Owner of the source repo (default: derived from remote URL in local git repo)",
)
self.add_argument(
"--source-repo",
metavar="REPO",
help="Name of the source repo (default: derived from remote URL in local git repo)",
)
self.add_argument(
"--source-branch",
metavar="BRANCH",
help="Source branch (default: the current branch in local git repo)",
)
self.add_argument(
"--target-owner",
metavar="OWNER",
help="Target owner (default: parent of the source repo)",
)
self.add_argument(
"--target-branch",
metavar="BRANCH",
help="Target branch (default: derived from the current branch in local git repo)",
)
self.add_argument(
"--self",
action="store_true",
help="Use the local git repository as the target for the pull request",
)
self.add_argument(
"--separate-requests",
action="store_true",
help="Create separate pull requests for each package in the project",
)
self.add_argument(
"--dry-run",
action="store_true",
help="Do not actually create the pull request",
)
def run(self, args):
if args.separate_requests:
return self._run_separate_requests(args)
# the source args are optional, but if one of them is used, the others must be used too
source_args = (args.source_owner, args.source_repo, args.source_branch)
if sum((int(i is not None) for i in source_args)) not in (0, len(source_args)):
self.parser.error("All of the following options must be used together: --source-owner, --source-repo, --source-branch")
self.print_gitea_settings()
self._create_pr(args)
def _run_separate_requests(self, args):
from osc import gitea_api
from osc.git_scm.manifest import Manifest
# Packages discovery
cwd = os.getcwd()
packages = []
if os.path.exists("_manifest"):
manifest = Manifest.from_file("_manifest")
packages = manifest.get_package_paths(cwd)
else:
packages = [os.path.join(cwd, i) for i in os.listdir(cwd)]
# Filtering: must be a dir and contain .git
packages = [i for i in packages if os.path.isdir(i) and os.path.exists(os.path.join(i, ".git"))]
packages.sort()
if not packages:
print("No packages found.", file=sys.stderr)
return
self.print_gitea_settings()
for pkg_path in packages:
pkg_name = os.path.basename(pkg_path)
# print(f"Processing {pkg_name}...", file=sys.stderr)
try:
self._create_pr(args, git_dir=pkg_path, ignore_identical=True)
except gitea_api.GitObsRuntimeError as e:
print(f"Skipping {pkg_name}: {e}", file=sys.stderr)
except Exception as e:
print(f"Error processing {pkg_name}: {e}", file=sys.stderr)
def _create_pr(self, args, git_dir=".", ignore_identical=False):
from osc import gitea_api
from osc.output import tty
use_local_git = args.source_owner is None
if use_local_git:
# local git repo
git = gitea_api.Git(git_dir)
local_owner, local_repo = git.get_owner_repo()
local_branch = git.current_branch
if not local_branch:
raise gitea_api.GitObsRuntimeError(f"Unable to determine current branch in {git_dir}. Are you in 'detached HEAD' state?")
local_commit = git.get_branch_head(local_branch)
if args.self and not use_local_git:
self.parser.error("--self can only be used together with local git repository (i.e. without --source-owner, --source-repo, --source-branch)")
# remote git repo - source
if use_local_git:
source_owner = local_owner
source_repo = local_repo
source_branch = local_branch
else:
source_owner = args.source_owner
source_repo = args.source_repo
source_branch = args.source_branch
source_repo_obj = gitea_api.Repo.get(self.gitea_conn, source_owner, source_repo)
source_branch_obj = gitea_api.Branch.get(self.gitea_conn, source_owner, source_repo, source_branch)
if args.self:
target_owner = source_owner
target_repo = source_repo
elif args.target_owner:
target_owner = args.target_owner
target_repo = None
parents = gitea_api.Repo.get_parent_repos(self.gitea_conn, source_owner, source_repo)
for parent in parents:
if parent.owner.lower() == args.target_owner.lower():
target_repo = parent.repo
break
if not target_repo:
raise gitea_api.GitObsRuntimeError(f"Unable to create a pull request because owner '{target_owner}' has no matching parent repo for '{source_owner}/{source_repo}'")
elif source_repo_obj.parent_obj is None:
raise gitea_api.GitObsRuntimeError(f"Unable to create a pull request because repo '{source_owner}/{source_repo}' is not a fork")
else:
# remote git repo - target
target_owner = source_repo_obj.parent_obj.owner
target_repo = source_repo_obj.parent_obj.repo
if args.target_branch:
target_branch = args.target_branch
elif source_branch.startswith("for/"):
# source branch name format: for/<target-branch>/<what-the-branch-name-would-normally-be>
target_branch = source_branch.split("/")[1]
else:
target_branch = source_branch
target_branch_obj = gitea_api.Branch.get(self.gitea_conn, target_owner, target_repo, target_branch)
# Check difference: Local vs Target (specific for separate-requests/package iteration)
if ignore_identical and use_local_git and local_commit == target_branch_obj.commit:
print(f"Skipping {os.path.basename(git_dir)}: up to date ({target_branch_obj.commit}).", file=sys.stderr)
return
print("Creating a pull request ...", file=sys.stderr)
if use_local_git:
print(f" * Local git: branch: {local_branch}, commit: {local_commit}", file=sys.stderr)
print(f" * Source: {source_owner}/{source_repo}, branch: {source_branch_obj.name}, commit: {source_branch_obj.commit}", file=sys.stderr)
print(f" * Target: {target_owner}/{target_repo}, branch: {target_branch_obj.name}, commit: {target_branch_obj.commit}", file=sys.stderr)
if use_local_git and local_commit != source_branch_obj.commit:
msg = "Local commit doesn't correspond with the latest commit in the remote source branch"
if ignore_identical:
raise gitea_api.GitObsRuntimeError(msg)
print(f"{tty.colorize('ERROR', 'red,bold')}: {msg}")
sys.exit(1)
if source_branch_obj.commit == target_branch_obj.commit:
msg = "Source and target are identical, make and push changes to the remote source repo first"
if ignore_identical:
return
print(f"{tty.colorize('ERROR', 'red,bold')}: {msg}")
sys.exit(1)
title = args.title or ""
description = args.description or ""
if not title or not description:
if args.dry_run:
title = "[DRY RUN] Title"
description = "[DRY RUN] Description"
else:
# TODO: add list of commits and list of changed files to the template; requires local git repo
if use_local_git:
git_status = git.status(untracked_files=True)
git_status = "\n".join([f"# {i}" for i in git_status.splitlines()])
else:
git_status = "#"
if use_local_git:
git_commits = git._run_git(["log", "--format=- %s", f"{target_branch_obj.commit}..{source_branch_obj.commit}"])
git_commits = "\n".join([f"# {i}" for i in git_commits.splitlines()])
else:
git_commits = "#"
message = gitea_api.edit_message(template=NEW_PULL_REQUEST_TEMPLATE.format(**locals()))
# remove comments
message = "\n".join([i for i in message.splitlines() if not i.startswith("#")])
# strip leading and trailing spaces
message = message.strip()
if not message:
raise gitea_api.GitObsRuntimeError("Aborting operation due to empty title and description.")
parts = re.split(r"\n\n", message, 1)
if len(parts) == 1:
# empty description
title = parts[0]
description = ""
else:
title = parts[0]
description = parts[1]
title = title.strip()
description = description.strip()
if args.dry_run:
print("", file=sys.stderr)
print("Pull request would be created (DRY RUN):", file=sys.stderr)
print(f"Title: {title}", file=sys.stderr)
print(f"Description: {description}", file=sys.stderr)
return
pr_obj = gitea_api.PullRequest.create(
self.gitea_conn,
target_owner=target_owner,
target_repo=target_repo,
target_branch=target_branch,
source_owner=source_owner,
# source_repo is not required because the information lives in Gitea database
source_branch=source_branch,
title=title,
description=description,
)
print("", file=sys.stderr)
print("Pull request created:", file=sys.stderr)
print(pr_obj.to_human_readable_string())