repoactive 0.2.5.dev1__tar.gz → 0.2.7__tar.gz

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: repoactive
-Version: 0.2.5.dev1
+Version: 0.2.7
 Summary: Script-driven code changes with automated merge requests
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE
@@ -458,6 +458,11 @@ block.
   every MR/PR so it merges automatically once its pipeline passes. On
   GitHub, the repository must have "Allow auto-merge" enabled in its
   settings.
+- **`required_approvals`** (default: none) - Minimum number of approvals
+  required before the MR can be merged. **GitLab only** - this sets the
+  per-MR approval requirement. GitHub has no per-PR equivalent (required
+  approvals are a repository-wide branch protection setting), so a job that
+  sets `required_approvals` against a GitHub repository fails with an error.
 
 **Branch and commit options:**
 
@@ -506,6 +511,9 @@ underscores.
   already contains this job's changes - see [Stacking MRs](#stacking-mrs)).
 - **`auto_merge`** (default: inherited from `job-defaults`) - When `true`,
   enable auto-merge on this job's MR/PR.
+- **`required_approvals`** (default: inherited from `job-defaults`) -
+  Minimum number of approvals required before this job's MR can be merged.
+  GitLab only; see `job-defaults.required_approvals`.
 
 **Branch and commit options:**
 
@@ -907,7 +915,9 @@ cooldown_on = ["full-lock"]
 inherited from `[job-defaults]`); without a window there is nothing to
 throttle against, so a config that sets one without the other is rejected.
 The relationship is one-directional and needs no change to the broad job -
-it still writes only its own trailer.
+it still writes only its own trailer. The listed names need not match a job
+in the current config: they match trailers already landed on the base
+branch, which may come from jobs that have since been removed or renamed.
 
 This only suppresses _starting_ a redundant run. A narrow job that already
 has an open, unmerged branch is always refreshed regardless of cooldown (see
@@ -974,6 +984,10 @@ command = "uv lock --upgrade --package pkg-a"
 title = "build: upgrade pkg-a"
 ```
 
+Fragments may only contain `[job.<name>]` tables; anything else (e.g.
+`[job-defaults]`) fails the generator. To set defaults for the emitted jobs,
+set them on the generator itself — they are inherited (see below).
+
 Key points:
 
 - **Selection is unchanged.** A generator is selected like any job (by the

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/README.md

@@ -431,6 +431,11 @@ block.
   every MR/PR so it merges automatically once its pipeline passes. On
   GitHub, the repository must have "Allow auto-merge" enabled in its
   settings.
+- **`required_approvals`** (default: none) - Minimum number of approvals
+  required before the MR can be merged. **GitLab only** - this sets the
+  per-MR approval requirement. GitHub has no per-PR equivalent (required
+  approvals are a repository-wide branch protection setting), so a job that
+  sets `required_approvals` against a GitHub repository fails with an error.
 
 **Branch and commit options:**
 
@@ -479,6 +484,9 @@ underscores.
   already contains this job's changes - see [Stacking MRs](#stacking-mrs)).
 - **`auto_merge`** (default: inherited from `job-defaults`) - When `true`,
   enable auto-merge on this job's MR/PR.
+- **`required_approvals`** (default: inherited from `job-defaults`) -
+  Minimum number of approvals required before this job's MR can be merged.
+  GitLab only; see `job-defaults.required_approvals`.
 
 **Branch and commit options:**
 
@@ -880,7 +888,9 @@ cooldown_on = ["full-lock"]
 inherited from `[job-defaults]`); without a window there is nothing to
 throttle against, so a config that sets one without the other is rejected.
 The relationship is one-directional and needs no change to the broad job -
-it still writes only its own trailer.
+it still writes only its own trailer. The listed names need not match a job
+in the current config: they match trailers already landed on the base
+branch, which may come from jobs that have since been removed or renamed.
 
 This only suppresses _starting_ a redundant run. A narrow job that already
 has an open, unmerged branch is always refreshed regardless of cooldown (see
@@ -947,6 +957,10 @@ command = "uv lock --upgrade --package pkg-a"
 title = "build: upgrade pkg-a"
 ```
 
+Fragments may only contain `[job.<name>]` tables; anything else (e.g.
+`[job-defaults]`) fails the generator. To set defaults for the emitted jobs,
+set them on the generator itself — they are inherited (see below).
+
 Key points:
 
 - **Selection is unchanged.** A generator is selected like any job (by the

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/pyproject.toml

@@ -10,7 +10,7 @@ only-include = ["src"]
 
 [project]
 name = "repoactive"
-version = "0.2.5.dev1"
+version = "0.2.7"
 description = "Script-driven code changes with automated merge requests"
 readme = "README.md"
 requires-python = ">=3.11"

repoactive-0.2.7/src/repoactive/boxquote.py

@@ -0,0 +1,32 @@
+"""Render and strip boxquote.el-style boxes used to embed command output in messages."""
+
+import re
+
+# A boxquote block: a ``,----`` opening line through its closing ``` `---- ``` line.
+# DOTALL lets ``.*?`` span the body lines; MULTILINE anchors both delimiters to a
+# line of their own. Non-greedy so each block stops at its own closing line.
+_BOXQUOTE_BLOCK = re.compile(r"^,----.*?^`----[ \t]*$", re.MULTILINE | re.DOTALL)
+
+
+def boxquote(msg: str, title: str = "") -> str:
+    """Render ``msg`` inside a boxquote.el-style box.
+
+    The first line is ``,----[ title ]`` (or just ``,----`` when ``title`` is
+    empty), each line of ``msg`` is prefixed with ``| ``, and the box closes
+    with ``` `---- ```.
+    """
+    top = f",----[ {title} ]" if title else ",----"
+    body = "\n".join(f"| {line}" for line in msg.splitlines())
+    return f"{top}\n{body}\n`----"
+
+
+def strip_boxquotes(text: str) -> str:
+    """Remove every boxquote block (see :func:`boxquote`) from ``text``.
+
+    A block runs from a ``,----`` opening line to its closing ``` `---- ``` line;
+    the surrounding text is kept. Blank lines exposed by a removed block are
+    collapsed so paragraphs stay separated by a single blank line, and leading
+    and trailing blank lines are trimmed.
+    """
+    without = _BOXQUOTE_BLOCK.sub("", text)
+    return re.sub(r"\n{3,}", "\n\n", without).strip("\n")

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/src/repoactive/cli.py

@@ -42,10 +42,9 @@ from repoactive.platforms import (
 from repoactive.platforms.base import PlatformError
 from repoactive.runner import (
     RunMode,
-    UnknownJobsError,
-    UnknownTagsError,
     run_all,
 )
+from repoactive.selection import UnknownJobsError, UnknownTagsError
 from repoactive.settings import SettingsError, load_settings
 from repoactive.ui import err_console, print_undo_hint
 
@@ -241,8 +240,8 @@ def run(  # noqa: PLR0913
             config=cfg,
             repo_path=repo,
             platform=platform,
-            requested_names=jobs or None,
-            requested_tags=tags or None,
+            requested_names=frozenset(jobs or []),
+            requested_tags=frozenset(tags or []),
             mode=mode,
         )
     except RunLockHeldError as e:
@@ -361,14 +360,14 @@ def dump_schema(
 def _print_commit_table(commits: list[JobCommit]) -> None:
     """Print ``commits`` as columns padded to their widest value."""
     names_column = [",".join(sorted(c.job_names)) for c in commits]
-    id_width = max(len(c.commit_id) for c in commits)
+    commit_width = max(len(c.commit_id) for c in commits)
     change_width = max(len(c.change_id) for c in commits)
-    name_width = max(len(names) for names in names_column)
+    names_width = max(len(names) for names in names_column)
     age_width = max(len(c.relative_age) for c in commits)
     for c, names in zip(commits, names_column, strict=True):
         typer.echo(
-            f"{c.commit_id:<{id_width}}  {c.change_id:<{change_width}}  "
-            f"{names:<{name_width}}  {c.relative_age:<{age_width}}  {c.subject}"
+            f"{c.commit_id:<{commit_width}}  {c.change_id:<{change_width}}  "
+            f"{names:<{names_width}}  {c.relative_age:<{age_width}}  {c.subject}"
         )
 
 

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/src/repoactive/config.py

@@ -11,7 +11,7 @@ from dataclasses import dataclass
 from datetime import timedelta
 from enum import StrEnum
 from pathlib import Path
-from typing import Annotated, Literal
+from typing import Annotated, Literal, cast
 
 from pydantic import (
     AfterValidator,
@@ -112,15 +112,6 @@ class UnknownRunOnlyIfChangedError(ValueError):
         )
 
 
-class UnknownCooldownOnError(ValueError):
-    """Raised when cooldown_on references a job that does not exist."""
-
-    def __init__(self, name: str, unknown: list[str]) -> None:
-        super().__init__(
-            f"job '{name}' cooldown_on references unknown job(s): {', '.join(unknown)}"
-        )
-
-
 class SelfCooldownOnError(ValueError):
     """Raised when a job lists itself in cooldown_on."""
 
@@ -166,40 +157,6 @@ class GeneratedByInBodyError(ValueError):
         )
 
 
-class JobNotTableError(ValueError):
-    """Raised when a [job.<name>] entry is not a table."""
-
-    def __init__(self, name: str) -> None:
-        super().__init__(f"job {name!r} must be a table ([job.{name}])")
-
-
-class JobsNotTableError(ValueError):
-    """Raised when 'job' is not a table keyed by name (e.g. the old array form)."""
-
-    def __init__(self) -> None:
-        super().__init__(
-            "jobs must be a table keyed by name ([job.<name>]); the [[job]] array form "
-            "with a 'name' field is no longer supported"
-        )
-
-
-class PlatformNotTableError(ValueError):
-    """Raised when a [platform.<name>] entry is not a table."""
-
-    def __init__(self, name: str) -> None:
-        super().__init__(f"platform {name!r} must be a table ([platform.{name}])")
-
-
-class PlatformsNotTableError(ValueError):
-    """Raised when 'platform' is not a table keyed by name (e.g. the old array form)."""
-
-    def __init__(self) -> None:
-        super().__init__(
-            "platforms must be a table keyed by name ([platform.<name>]); the [[platform]] "
-            "array form is no longer supported"
-        )
-
-
 class DuplicatePlatformHostError(ValueError):
     """Raised when two platforms resolve to the same host.
 
@@ -278,8 +235,18 @@ def _validate_duration(value: str) -> str:
     return value
 
 
+def _validate_single_line(value: str, info: ValidationInfo) -> str:
+    if "\n" in value:
+        assert info.field_name is not None
+        raise NewlineInTitleError(info.field_name, value)
+    return value
+
+
 _BranchPrefix = Annotated[str, AfterValidator(_validate_branch_prefix)]
 _Duration = Annotated[str, AfterValidator(_validate_duration)]
+# Titles and title prefixes end up in commit subjects and MR titles, which are
+# single-line by nature.
+_SingleLine = Annotated[str, AfterValidator(_validate_single_line)]
 # json_schema_input_type keeps booleans valid in the published JSON schema.
 _CreateMR = Annotated[
     CreateMR, BeforeValidator(_coerce_create_mr, json_schema_input_type=bool | CreateMR)
@@ -290,21 +257,14 @@ class JobDefaults(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     branch_prefix: _BranchPrefix = "repoactive/"
-    mr_title_prefix: str = "[repoactive] "
-    commit_title_prefix: str = "[repoactive] "
+    mr_title_prefix: _SingleLine = "[repoactive] "
+    commit_title_prefix: _SingleLine = "[repoactive] "
     labels: list[str] = Field(default_factory=list)
     base_branch: str | None = None
     cooldown_period: _Duration | None = None
     timeout: _Duration | None = "2m"
     auto_merge: bool = False
-
-    @field_validator("mr_title_prefix", "commit_title_prefix")
-    @classmethod
-    def _check_no_newline(cls, value: str, info: ValidationInfo) -> str:
-        if "\n" in value:
-            assert info.field_name is not None
-            raise NewlineInTitleError(info.field_name, value)
-        return value
+    required_approvals: int | None = Field(default=None, ge=0)
 
 
 # Fields Job.resolve fills in from JobDefaults when the job does not set them
@@ -317,6 +277,7 @@ _DEFAULTED_FIELDS = (
     "cooldown_period",
     "timeout",
     "auto_merge",
+    "required_approvals",
 )
 
 
@@ -325,7 +286,7 @@ class Job(BaseModel):
 
     name: str
     command: str
-    title: str
+    title: _SingleLine
     description: str | None = None
     base_branch: str | None = None
     draft: bool = False
@@ -352,12 +313,13 @@ class Job(BaseModel):
 
     # the following fields will be resolved from the defaults
     branch_prefix: _BranchPrefix | None = None
-    mr_title_prefix: str | None = None
-    commit_title_prefix: str | None = None
+    mr_title_prefix: _SingleLine | None = None
+    commit_title_prefix: _SingleLine | None = None
     labels: list[str] = Field(default_factory=list)
     cooldown_period: _Duration | None = None
     timeout: _Duration | None = None
     auto_merge: bool | None = None
+    required_approvals: int | None = Field(default=None, ge=0)
 
     @field_validator("name")
     @classmethod
@@ -366,12 +328,15 @@ class Job(BaseModel):
             raise InvalidJobNameError(value)
         return value
 
-    @field_validator("title", "commit_title_prefix")
+    @field_validator("cooldown_on")
     @classmethod
-    def _check_no_newline(cls, value: str, info: ValidationInfo) -> str:
-        if "\n" in value:
-            assert info.field_name is not None
-            raise NewlineInTitleError(info.field_name, value)
+    def _check_cooldown_on(cls, value: list[str]) -> list[str]:
+        # The names need not match a configured job (the trailers they match may
+        # come from jobs since removed from the config), but they are interpolated
+        # into the cooldown revset, so they must stay within the job-name alphabet.
+        for name in value:
+            if not _JOB_NAME_RE.match(name):
+                raise InvalidJobNameError(name)
         return value
 
     @field_validator("tags")
@@ -453,14 +418,16 @@ class Config(BaseModel):
         TOML stores jobs as a table keyed by name; the name comes from the key
         and is injected into each job. A non-mapping value (e.g. an already-built
         ``list[Job]`` passed programmatically) passes through unchanged.
+
+        Each entry is assumed to be a table: ``load_config`` validates every
+        source against ``ConfigShape`` first, and programmatic callers must
+        pass tables as well.
         """
         if not isinstance(value, dict):
             return value
         jobs: list[dict] = []
-        for key, body in value.items():
+        for key, body in cast("dict[str, dict]", value).items():
             name = str(key)
-            if not isinstance(body, dict):
-                raise JobNotTableError(name)
             if "name" in body:
                 raise JobNameInBodyError(name)
             if "generated_by" in body:
@@ -477,15 +444,14 @@ class Config(BaseModel):
         (platforms are matched by ``url``), so it is dropped here. A non-mapping
         value (e.g. an already-built ``list`` passed programmatically) passes
         through unchanged.
+
+        Each entry is assumed to be a table: ``load_config`` validates every
+        source against ``ConfigShape`` first, and programmatic callers must
+        pass tables as well.
         """
         if not isinstance(value, dict):
             return value
-        platforms: list[dict] = []
-        for key, body in value.items():
-            if not isinstance(body, dict):
-                raise PlatformNotTableError(str(key))
-            platforms.append(body)
-        return platforms
+        return list(value.values())
 
     @model_validator(mode="after")
     def validate_unique_platform_hosts(self) -> Config:
@@ -523,13 +489,12 @@ class Config(BaseModel):
 
     @model_validator(mode="after")
     def validate_cooldown_on(self) -> Config:
-        names = {j.name for j in self.jobs}
+        # cooldown_on names are deliberately not checked against the configured
+        # jobs: they match trailers already landed on the base branch, which may
+        # come from jobs since removed or renamed from the config.
         for job in self.jobs:
             if not job.cooldown_on:
                 continue
-            unknown = sorted(set(job.cooldown_on) - names)
-            if unknown:
-                raise UnknownCooldownOnError(job.name, unknown)
             if job.name in job.cooldown_on:
                 raise SelfCooldownOnError(job.name)
             # cooldown_on only throttles against a cooldown window; without one
@@ -565,28 +530,35 @@ class Config(BaseModel):
         return {p.token_env for p in self.platforms}
 
 
-def jobs_table(value: object) -> dict:
-    """Return ``value`` as a job table, rejecting the old ``[[job]]`` array form.
+class ConfigShape(BaseModel):
+    """Structural shape of a raw config source, validated before merging.
 
-    TOML parses ``[job.<name>]`` tables into a dict keyed by name; an array of
-    tables (the format used before) parses into a list, which is no longer
-    accepted.
+    Merging digs into the ``job`` and ``platform`` tables, so each must be a
+    table of tables, and ``job-defaults`` must be a table; an odd shape (e.g.
+    ``job.foo = "hello"``) would otherwise crash the merge with an unhelpful
+    error. Only the shape is checked here — field contents and any other keys
+    are validated by ``Config`` after the merge.
     """
-    if not isinstance(value, dict):
-        raise JobsNotTableError
-    return value
 
+    model_config = ConfigDict(populate_by_name=True, extra="allow")
+
+    job: dict[str, dict] = Field(default_factory=dict)
+    platform: dict[str, dict] = Field(default_factory=dict)
+    job_defaults: dict = Field(alias="job-defaults", default_factory=dict)
 
-def platforms_table(value: object) -> dict:
-    """Return ``value`` as a platform table, rejecting the old ``[[platform]]`` array.
 
-    TOML parses ``[platform.<name>]`` tables into a dict keyed by name; an array
-    of tables (the format used before) parses into a list, which is no longer
-    accepted.
+class FragmentShape(BaseModel):
+    """Structural shape of a generator-emitted job fragment.
+
+    Generators may only emit ``[job.<name>]`` tables: the generator job itself
+    acts as the scoped job-defaults for its emitted jobs (ADR 0004), so a
+    ``[job-defaults]`` or ``[platform]`` in a fragment would never apply and
+    is rejected instead of silently ignored.
     """
-    if not isinstance(value, dict):
-        raise PlatformsNotTableError
-    return value
+
+    model_config = ConfigDict(extra="forbid")
+
+    job: dict[str, dict] = Field(default_factory=dict)
 
 
 def _deep_merge(*, base: dict, override: dict) -> dict:
@@ -741,10 +713,13 @@ def _merge_config(sources: Iterable[_ConfigSource]) -> Config:
     for source in sources:
         data = source.data
         try:
-            jobs = merge_jobs(base=merged.get("job", {}), override=jobs_table(data.get("job", {})))
+            # Reject odd shapes (e.g. job.foo = "hello") up front; the merge
+            # helpers assume tables of tables and would fail cryptically.
+            shape = ConfigShape.model_validate(data)
+            jobs = merge_jobs(base=merged.get("job", {}), override=shape.job)
             platforms = merge_platforms(
                 base=merged.get("platform", {}),
-                override=platforms_table(data.get("platform", {})),
+                override=shape.platform,
             )
             merged = _deep_merge(base=merged, override=data)
             merged["job"] = jobs

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/src/repoactive/jj.py

@@ -219,9 +219,6 @@ class JJ:
     def new(self, *parents: str) -> None:
         self._run("new", *parents)
 
-    def edit(self, revision: str) -> None:
-        self._run("edit", revision)
-
     def restore(self, *, source_rev: str, destination_rev: str) -> None:
         self._run("restore", "--from", source_rev, "--into", destination_rev)
 
@@ -354,27 +351,8 @@ class JJ:
                 )
         return result
 
-    def pending_job_names(self, revset: str | None = None) -> set[str]:
-        """Job names that appear on unmerged commits reachable via ``revset``.
-
-        Without ``revset``: scans all commits not yet landed in trunk —
-        used by the default run to refresh stale branches (ADR 0003). A commit
-        may carry more than one trailer (a generated job records both its own
-        name and the generator's, see ADR 0004), so comma-joined values are
-        split; job names never contain commas.
-
-        With ``revset``: scans all descendants of ``revset`` that are not
-        in trunk — used by successor expansion to pull in jobs whose commits
-        sit anywhere in the stack above a selected job's bookmark (ADR 0012).
-        Uses ``present()`` semantics implicitly via the caller-supplied revset,
-        so non-existent bookmarks are silently skipped.
-        """
-        if revset is not None:
-            if not revset:
-                return set()
-            target = f"descendants({revset}) & ~({revset}) & ~(::trunk())"
-        else:
-            target = "~(::trunk())"
+    def job_names_in_revset(self, revset: str) -> set[str]:
+        """Job names that appear in revset."""
         template = f"""
         if(trailers.contains_key("{JOB_TRAILER_KEY}"),
            trailers.filter(|t| t.key() == "{JOB_TRAILER_KEY}").map(|t| t.value()).join(",")
@@ -382,7 +360,7 @@ class JJ:
            ""
         )
         """
-        output = self._run("log", "--no-graph", "-r", target, "-T", template)
+        output = self._run("log", "--no-graph", "-r", revset, "-T", template)
         return {
             name.strip()
             for line in output.splitlines()
@@ -421,8 +399,8 @@ class JJ:
         lines = [line.strip() for line in output.splitlines() if line.strip()]
         if not lines:
             return None
-        # jj log returns newest-first; take the first line.
-        return datetime.fromisoformat(lines[0]).replace(tzinfo=UTC)
+        # ISO-8601 strings are lexicographically ordered, so max() gives the newest.
+        return datetime.fromisoformat(max(lines)).replace(tzinfo=UTC)
 
     def git_push_bookmarks(self, *bookmarks: str) -> None:
         """Push bookmarks to the remote.

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/src/repoactive/platforms/base.py

@@ -26,6 +26,7 @@ class MRParams:
     labels: list[str]
     draft: bool
     auto_merge: bool = False
+    required_approvals: int | None = None
 
 
 class Platform(ABC):

{repoactive-0.2.5.dev1 → repoactive-0.2.7}/src/repoactive/platforms/github.py

@@ -8,6 +8,22 @@ _DEFAULT_API_URL = "https://api.github.com"
 _PUBLIC_GITHUB_URL = "https://github.com"
 
 
+class RequiredApprovalsNotSupportedError(Exception):
+    """Raised when a job sets required_approvals but its platform is GitHub.
+
+    GitHub has no per-PR approval requirement: the number of required
+    approvals is a repository-wide branch protection setting, so repoactive
+    cannot honor a per-job value there. required_approvals is GitLab-only.
+    """
+
+    def __init__(self) -> None:
+        super().__init__(
+            "required_approvals is not supported on GitHub: the number of required "
+            "approvals is a repository-wide branch protection setting, not a per-PR "
+            "value. Remove required_approvals from the job (it is supported on GitLab only)."
+        )
+
+
 class GitHubPlatform(Platform):
     def __init__(self, *, url: str | None, token: str, repo: str) -> None:
         normalized = (url or "").rstrip("/")
@@ -26,6 +42,8 @@ class GitHubPlatform(Platform):
         return self._repo.default_branch
 
     def ensure_mr(self, params: MRParams) -> str:
+        if params.required_approvals is not None:
+            raise RequiredApprovalsNotSupportedError
         owner = self._repo.owner.login
         # Look up by head only: filtering on base would miss the PR after the
         # job's base_branch changed, and a new PR would be opened next to the
@@ -60,5 +78,8 @@ class GitHubPlatform(Platform):
             if params.labels:
                 pr.set_labels(*params.labels)
         if params.auto_merge:
-            pr.enable_automerge()
+            try:
+                pr.enable_automerge()
+            except GithubException as e:
+                print(f"  warning: could not enable auto-merge ({e})")
         return pr.html_url