sync and publish name the Rebase-Review Gate by its display name
The help and exit-42 cause texts still said "rebase-review gate" after the display name was settled; the generated reference and CONTRACT row follow. Files changed: - CHANGES.md - VERSION - docs/reference/commands/git.md - docs/reference/exit-codes.md - tools/CONTRACT.md - tools/chemenu/commands/git_publish.py Co-Authored-By: Claude Code <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SnAJ7Z3CpVD3PRbN73QtU2
This commit is contained in:
1 parent
e9f4759727
commit
5915b07383
6 files changed
+26
-25
No files matched your search
@@ -1343,7 +1343,7 @@ def apply_reconcile(outcome: ReconcileOutcome, remote: str, branch: str, command
|
||||
notes=(
|
||||
"Fetches `<remote>/<branch>`, then: fast-forwards when only the remote moved; rebases "
|
||||
"the local commits on top when both sides moved but touched disjoint files; exits 42 "
|
||||
"(rebase-review gate) when both sides touched the same file.",
|
||||
"(Rebase-Review Gate) when both sides touched the same file.",
|
||||
"Files `wikitool` generates (`kb/index.md`, `kb/log.md`, `kb/provenance.md`, every "
|
||||
"`kb/**/INDEX.md`) never count as an overlap and never reach the gate. Where they are "
|
||||
"what stops git - uncommitted ones in the way of a fast-forward or rebase, or a rebase "
|
||||
@@ -1389,7 +1389,7 @@ def apply_reconcile(outcome: ReconcileOutcome, remote: str, branch: str, command
|
||||
"out of the way, re-run once",
|
||||
),
|
||||
cli_contract.Failure(
|
||||
cause="Rebase-review gate: `<remote>/<branch>` moved and both sides changed the "
|
||||
cause="Rebase-Review Gate: `<remote>/<branch>` moved and both sides changed the "
|
||||
"same file, generated files aside; the output lists the upstream commits, the "
|
||||
"overlapping files and their diff",
|
||||
reaction=cli_contract.token_gate_reaction("--confirm-rebase"),
|
||||
@@ -1417,7 +1417,7 @@ def sync_command(
|
||||
None,
|
||||
"--confirm-rebase",
|
||||
metavar="TOKEN",
|
||||
help="Clear the rebase-review gate for the exact upstream state and file overlap this "
|
||||
help="Clear the Rebase-Review Gate for the exact upstream state and file overlap this "
|
||||
"token was issued for. The token comes from the gate's own refusal output.",
|
||||
),
|
||||
):
|
||||
@@ -1506,7 +1506,7 @@ def commit_regenerated(remote: str, branch: str) -> None:
|
||||
effect=cli_contract.Effect.WRITE,
|
||||
idempotent=cli_contract.Idempotent.NO,
|
||||
atomic="No - sequential git operations. Every gate runs before staging, except on the "
|
||||
"one retry of a rejected push, where the rebase-review gate can exit 42 after the "
|
||||
"one retry of a rejected push, where the Rebase-Review Gate can exit 42 after the "
|
||||
"commit: nothing is pushed, and the re-run with `--confirm-rebase` pushes that commit",
|
||||
budget=cli_contract.Budget.COUNTED,
|
||||
network=cli_contract.Network.YES,
|
||||
@@ -1525,7 +1525,7 @@ def commit_regenerated(remote: str, branch: str) -> None:
|
||||
"case: the first publish of an instance commits and pushes as before.",
|
||||
"Reconcile: fetches `<remote>/<branch>`, fast-forwards when only the remote moved, "
|
||||
"rebases the local commits on top when both sides moved but touched disjoint files, "
|
||||
"and exits 42 (rebase-review gate) when both sides touched the same file. A refused "
|
||||
"and exits 42 (Rebase-Review Gate) when both sides touched the same file. A refused "
|
||||
"reconcile performs no rebase attempt. The `--confirm-rebase` token covers the exact "
|
||||
"upstream state and the set of files touched on both sides.",
|
||||
"Generated files are never an overlap: where they are all that stops the reconcile, it "
|
||||
@@ -1626,7 +1626,7 @@ def commit_regenerated(remote: str, branch: str) -> None:
|
||||
code=42,
|
||||
),
|
||||
cli_contract.Failure(
|
||||
cause="Rebase-review gate: `<remote>/<branch>` moved and both sides changed the "
|
||||
cause="Rebase-Review Gate: `<remote>/<branch>` moved and both sides changed the "
|
||||
"same file; the output lists the upstream commits, the overlapping files and their "
|
||||
"diff",
|
||||
reaction=cli_contract.token_gate_reaction("--confirm-rebase"),
|
||||
@@ -1677,7 +1677,7 @@ def publish_command(
|
||||
None,
|
||||
"--confirm-rebase",
|
||||
metavar="TOKEN",
|
||||
help="Clear the rebase-review gate raised by the pre-push reconcile step. The token "
|
||||
help="Clear the Rebase-Review Gate raised by the pre-push reconcile step. The token "
|
||||
"comes from that gate's own refusal output - see `tools/wikitool sync`.",
|
||||
),
|
||||
yes: bool = typer.Option(
|
||||
|
||||
Reference in new issue
Block a user