gitpro 0.4.1__tar.gz → 0.4.3__tar.gz

{gitpro-0.4.1 → gitpro-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gitpro
-Version: 0.4.1
+Version: 0.4.3
 Summary: Per-remote git identities (name, email, SSH key, commit signing) from one TOML file
 Project-URL: Homepage, https://gitpro.dev
 Project-URL: Source, https://github.com/Yantrakar/gitpro
@@ -34,6 +34,8 @@ Description-Content-Type: text/markdown
 
 [gitpro.dev](https://gitpro.dev) · [PyPI](https://pypi.org/project/gitpro/) · [VS Code](https://marketplace.visualstudio.com/items?itemName=yantrakar.gitpro) · made by [Yantrakar](https://yantrakar.com)
 
+![gitpro refuses a commit in a work repo that would use the personal email, removes the repo's own email setting, and the commit then uses the work email, while a personal repo keeps the personal one](https://gitpro.dev/demo.gif)
+
 Work on a company repository, commit with your work email. Switch to a personal
 project, use your personal identity. Gitpro chooses by **remote URL**, not by
 where you happened to clone the repository.
@@ -114,12 +116,10 @@ see [agent workflows](docs/agent-workflows.md).
 
 ## Problems and questions
 
-Run `gitpro report` to draft an issue with the versions and a redacted
-`gitpro why`; it shows you the draft and opens nothing until you say yes.
-Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
+Run `gitpro report` to draft an issue with the versions and a redacted `gitpro why`; it shows
+you the draft and opens nothing until you say yes. Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
 Report a security problem privately with `gitpro report --security`, as the
-[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes,
-not in a public issue.
+[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes, not in a public issue.
 
 ## License
 

{gitpro-0.4.1 → gitpro-0.4.3}/README.md

@@ -8,6 +8,8 @@
 
 [gitpro.dev](https://gitpro.dev) · [PyPI](https://pypi.org/project/gitpro/) · [VS Code](https://marketplace.visualstudio.com/items?itemName=yantrakar.gitpro) · made by [Yantrakar](https://yantrakar.com)
 
+![gitpro refuses a commit in a work repo that would use the personal email, removes the repo's own email setting, and the commit then uses the work email, while a personal repo keeps the personal one](https://gitpro.dev/demo.gif)
+
 Work on a company repository, commit with your work email. Switch to a personal
 project, use your personal identity. Gitpro chooses by **remote URL**, not by
 where you happened to clone the repository.
@@ -88,12 +90,10 @@ see [agent workflows](docs/agent-workflows.md).
 
 ## Problems and questions
 
-Run `gitpro report` to draft an issue with the versions and a redacted
-`gitpro why`; it shows you the draft and opens nothing until you say yes.
-Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
+Run `gitpro report` to draft an issue with the versions and a redacted `gitpro why`; it shows
+you the draft and opens nothing until you say yes. Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
 Report a security problem privately with `gitpro report --security`, as the
-[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes,
-not in a public issue.
+[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes, not in a public issue.
 
 ## License
 

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/VERSION

@@ -1,3 +1,5 @@
+0.4.3  2026-10-21  release: gitpro.dev last, MCP Registry after PyPI only
+0.4.2  2026-10-20  README demo GIF, Marketplace keywords, Open VSX in the release run
 0.4.1  2026-10-18  secret masking, atomic writes, re-runnable release, version in one file
 0.4.0  2026-10-16  setup replaces init and apply; guard refuses mixed-identity repos
 0.3.4  report, support links and xdist CI

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/agents.py

@@ -1756,7 +1756,7 @@ def _edit(args: argparse.Namespace, removing: bool) -> int:
     shown = undo.tilde(t.path)
     if say and agent == "claude" and not removing:
         from . import view
-        view.step("plugin users already have this hook (gitpro agent status shows it)")
+        view.step("plugin users already have this hook (gitpro setup -n shows it)")
     if after == before and (obj is not None or removing):
         if args.json:
             jsonout.emit(command, {"file": str(t.path), "changed": False, "backup": None, "undo": None})
@@ -1883,7 +1883,7 @@ def status_data(home: Path, explicit_config: Optional[Path] = None) -> dict:
     plain, login = _command_v(False), _command_v(True)
     if not plain and login:
         warnings.append(f"gitpro is not on PATH for sh (found by login shell at {login}); the hook exits "
-                        f"silently without it → gitpro agent install --agent claude rewrites the entry with "
+                        f"silently without it → gitpro setup --agent claude rewrites the entry with "
                         f"the absolute path")
     return {"mode": mode, "agents": agents_, "guard_installed": guard_installed(),
             "gitpro_path": {"sh": plain, "login": login}, "warnings": warnings}

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/audit.py

@@ -580,7 +580,7 @@ def _rows(items: List[dict], verbose: bool, fmt) -> List[str]:
 
 
 def _rewrite_cmd(data: dict, args) -> str:
-    argv = [PROG, "audit", "--rewrite"]
+    argv = [PROG, "audit", "--fix"]
     if getattr(args, "config", None):
         argv += ["-c", str(args.config)]
     rw = data["rewrite"]
@@ -704,12 +704,13 @@ def _preview(data: dict, exp) -> List[str]:
 
 def cmd_audit(args) -> int:
     as_json = jsonout.wants_json(args)
+    flag = "--rewrite" if getattr(args, "rewrite_flag", False) else "--fix"   # errors name the flag given
     args.rewrite = args.rewrite or getattr(args, "rewrite_flag", False)
     if args.rewrite and getattr(args, "agents", False):
-        raise ConfigError("--rewrite needs the author audit; drop --agents")
+        raise ConfigError(f"{flag} needs the author audit; drop --agents")
     show_only = bool(args.rewrite and args.dry_run and preview_only(args))
     if args.rewrite and as_json and not args.yes and not show_only:
-        raise ConfigError("--json needs -y with --rewrite (there is no terminal to confirm on)")
+        raise ConfigError(f"--json needs -y with {flag} (there is no terminal to confirm on)")
     home = Path(args.home).expanduser().resolve()
     path, how = config.find(args.config, home)
     cfg = config.load_all(path, how)
@@ -775,11 +776,11 @@ def register(sub, common, confirm) -> None:
                     "not the repo's identity, commits made with an AI agent (Co-Authored-By trailers, bot "
                     "emails) and the [*.trailers] policy. Default: the unpushed commits (as of the last fetch) "
                     "plus the newest pushed ones.",
-        epilog="--rewrite fixes only the unpushed offending commits, keeps every date and never runs rebase; "
+        epilog="--fix fixes only the unpushed offending commits, keeps every date and never runs rebase; "
                "pushed commits are only reported. \"Pushed\" means reachable from a remote-tracking ref "
                "(refs/remotes/*) as of the last fetch: commits published only through a tag, `git push <url>` "
                "or Gerrit's refs/for/* count as unpushed, so fetch first. With commit.gpgsign set the new "
-               "commits are signed; notes are copied to them. With the guard installed (gitpro guard install) the commit-msg "
+               "commits are signed; notes are copied to them. With the guard installed (gitpro setup) the commit-msg "
                "hook applies the trailer policy at commit time; skip it once in your own shell with "
                "GITPRO_SKIP=1 git commit ...")
     sp.add_argument("dir", nargs="?", default=".", help="repo directory (default: .)")

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/clone.py

@@ -402,7 +402,7 @@ def _problem_line(prob: resolve.Problem, p: ClonePlan, top: Path, home: Path) ->
     if prob.code == "no_identity":
         where = f"{p.host}/{p.owner}" if p.host and p.owner else resolve.redact_url(p.clone_url)
         return (f"no identity for {where}: git will refuse to commit here → "
-                f"gitpro scan --suggest --repo {_sh(_tilde(top, home))}")
+                f"gitpro setup --add {_sh(_tilde(top, home))}")
     fix = resolve._shown_fix(prob)
     return prob.message + (f" → {fix}" if fix else "")
 

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/guard.py

@@ -348,7 +348,7 @@ def identity_push(ctx: Context) -> int:
     n = len(bad)
     lines = [f"{h} {e} {s}" for e, h, s in bad[:5]] + ([f"… and {n - 5} more"] if n > 5 else [])
     if _audit_available():
-        lines.append(f"fix:   {PROG} audit --rewrite {_tilde(str(ctx.repo))}")
+        lines.append(f"fix:   {PROG} audit --fix {_tilde(str(ctx.repo))}")
     else:
         lines.append("fix:   amend the listed commits with the right user.email (git rebase -i <base>, "
                      "then git commit --amend --no-edit on each)")
@@ -500,6 +500,17 @@ def _has_block(path: Path) -> bool:
         return False
 
 
+def _setup_hint(then: bool = False) -> str:
+    """How to install the global guard: setup does it unless the config says [guard] hooks = false."""
+    try:
+        off = _load_cfg(_home()).guard.hooks is False
+    except Exception:   # noqa: BLE001 - no config or a broken one: setup reports that itself
+        off = False
+    if off:
+        return f"{'then ' if then else ''}set [guard] hooks = true in your config and run {PROG} setup"
+    return f"{'then run ' if then else ''}{PROG} setup"
+
+
 def cmd_status(args) -> int:
     from . import jsonout
     from .render import GUARD_HOOKS, HOOK_NAMES, NOT_FORWARDED
@@ -528,9 +539,9 @@ def cmd_status(args) -> int:
                   "stubs call 'git lfs <hook>' unless the repo hook already does")
     elif st.get("effective_hooks_path"):
         other = st["effective_hooks_path"]
-        print(f"guard: core.hooksPath = {other} (not gitpro) → {chain_advice(other)}, then run {PROG} guard install")
+        print(f"guard: core.hooksPath = {other} (not gitpro) → {chain_advice(other)}, {_setup_hint(then=True)}")
     else:
-        print(f"guard: not installed → {PROG} guard install")
+        print(f"guard: not installed → {_setup_hint()}")
     if st.get("error"):
         print(f"⚠ guard status: {st['error']}", file=sys.stderr)
     if st["system_hooks_path"]:
@@ -662,7 +673,7 @@ def chain_missing(cfg, env) -> Optional[str]:
     if os.path.lexists(p):
         return None
     return (f"[guard] chain_to {cfg.guard.chain_to} does not exist; the hooks run without it → create it, "
-            f"or remove chain_to from the config and run {PROG} apply")
+            f"or remove chain_to from the config and run {PROG} setup")
 
 
 def check_chain_to(cfg, env, missing_ok: bool = False) -> Optional[Path]:
@@ -863,7 +874,7 @@ def cmd_uninstall(args) -> int:
     view.ok("guard removed; git runs each repo's own hooks again")
     print(f"↩ undo: sh {undo.tilde(script)}")
     if hooks_on:
-        view.warn(f"[guard] hooks = true in your config: the next '{PROG} apply' installs them again; set it to false")
+        view.warn(f"[guard] hooks = true in your config: the next '{PROG} setup' installs them again; set it to false")
     elif hooks_on is None:
         view.step(f"'{PROG} setup' installs them again; to keep them off, set [guard] hooks = false in your config")
     return 0
@@ -901,7 +912,7 @@ def _refuse_shared_hooks_dir(top: Path, hooks: Path) -> None:
     where = origin[5:] if origin.startswith("file:") else origin
     raise ConfigError(f"{tilde(hooks)} is core.hooksPath from {scope or 'unknown'} config"
                       f"{' (' + tilde(Path(where)) + ')' if where else ''}; other repos share it, so gitpro "
-                      f"does not edit it. Use {PROG} guard install with [guard] chain_to = \"{hooks}\", or add "
+                      f"does not edit it. Set [guard] chain_to = \"{hooks}\" in your config and run {PROG} setup, or add "
                       f"this block to {tilde(hooks / 'pre-commit')} yourself:\n{_block_help('pre-commit')}")
 
 

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/health.py

@@ -117,14 +117,14 @@ def classify(ktype: str, bits: int) -> Tuple[str, Optional[dict]]:
     if t == "RSA":
         if bits < 2048:
             return "rsa", _check("error", f"RSA {bits} is too weak; generate a new key",
-                                 "gitpro keys --generate after changing ssh_key", "weak")
+                                 "gitpro setup after changing ssh_key", "weak")
         if bits < 3072:
             return "rsa", _check("warning", f"RSA {bits} is below the recommended 3072 bits; ed25519 is better",
-                                 "gitpro keys --generate after changing ssh_key", "rsa-2048")
+                                 "gitpro setup after changing ssh_key", "rsa-2048")
         return "rsa", None
     if t == "DSA":
         return "dsa", _check("error", "DSA is too weak (current OpenSSH refuses it); generate a new key",
-                             "gitpro keys --generate after changing ssh_key", "weak")
+                             "gitpro setup after changing ssh_key", "weak")
     if t == "ECDSA":
         name = f"ecdsa-{bits}"
         return name, _check("warning", f"{name}: ed25519 is preferred", tag="ecdsa")
@@ -473,7 +473,7 @@ def _key_record(k, home: Path, uses: List[Use], agent: Optional[set], shared: Li
            "fixes": [], "checks": []}
     checks: List[dict] = rec["checks"]
     if not private.exists():
-        checks.append(_check("error", "missing", "gitpro keys --generate", "missing"))
+        checks.append(_check("error", "missing", "gitpro setup", "missing"))
     elif not pub.exists():
         ps = _tilde(pub, home)
         checks.append(_check("error", f"{ps} missing", f"ssh-keygen -y -f {_sh(shown)} > {_sh(ps)}", "missing"))
@@ -1000,7 +1000,7 @@ def upload(cfg, ids: Optional[List[str]] = None, *, title: Optional[str] = None,
         tpub, where = _tilde(pub, home), f"{t.acc.host} ({t.acc.login})"
         mat = material(pub)
         if mat is None:
-            warn(f"✗ {tpub} is missing or not a public key → gitpro keys --generate")
+            warn(f"✗ {tpub} is missing or not a public key → gitpro setup")
             failed += 1
             continue
         unsafe = pub_unsafe(pub)

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/keys.py

@@ -57,4 +57,4 @@ def report(keys: list[Key], expand: Expand) -> None:
         role = "auth + signing" if k.sign else "auth"
         print(f"  {k.path}  ({role})  ->  {'; '.join(k.uses)}")
         pub = pub_path(expand(k.path))
-        print(f"    {pub.read_text().strip()}" if pub.exists() else "    (missing -- run: gitpro keys --generate)")
+        print(f"    {pub.read_text().strip()}" if pub.exists() else "    (missing -- run: gitpro setup)")

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/lint.py

@@ -47,7 +47,7 @@ def warnings(d: Default, ids: list[Identity], env: Env) -> list[str]:
     for k in keys.inventory(d, ids):
         p = env.expand(k.path)
         if not p.exists():
-            out.append(f"{k.path} missing -- run: gitpro keys --generate")
+            out.append(f"{k.path} missing -- run: gitpro setup")
         elif p.stat().st_mode & 0o077:
             out.append(f"{k.path} is accessible by others -- chmod 600 {p}")
     return out

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/mcp.py

@@ -936,8 +936,8 @@ def install_change(agent: str, home: Path) -> Optional[str]:
     if _ours(current, entry):
         return None
     if current is not None:
-        raise ConfigError(f"{_foreign(path, current)}; left alone (gitpro mcp install --agent {agent} --force "
-                          "replaces it)")
+        raise ConfigError(f"{_foreign(path, current)}; left alone (remove that entry, then run "
+                          f"gitpro setup --agent {agent})")
     if agent == "claude" and shutil.which("claude"):
         return f"run {shlex.join(CLAUDE_ADD)}"
     return f"{'update' if obj is not None else 'create'} {_tilde_path(path)}"
@@ -993,7 +993,7 @@ def doctor_section(ctx) -> dict:
 def register(sub, common, confirm) -> None:
     from .args import capability
     p = sub.add_parser("mcp", parents=[common],
-                       help="run the read-only MCP server for AI assistants (stdio); install registers it")
+                       help="run the read-only MCP server for AI assistants (stdio); gitpro setup --agent NAME registers it")
     p.add_argument("--log", type=Path, metavar="FILE", help="append every request and response to FILE (0600)")
     p.add_argument("--allow-execution", action="store_true",
                    help="expose operation and approved-change execution; the host must authorize each write")

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/pin.py

@@ -43,7 +43,7 @@ def _resolved(repo: str, key: str, pin_path: Path, base: Path) -> str:
         origin, value, src = found_origin, found_value, found_src
     check(value, f"git resolves no {key} for this repo; nothing to pin")
     check(src is not None and src.is_file() and render.is_generated(src.read_text()),
-          f"{key} comes from {origin}, not from gitpro; run 'gitpro apply', "
+          f"{key} comes from {origin}, not from gitpro; run 'gitpro setup', "
           "and run pin on the host, not inside the container")
     return value
 

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/policy.py

@@ -1099,7 +1099,7 @@ def identity_checks(cfg, person: _Person, pol: Policy, rules: Sequence[Rule], ke
         label = "required" if required else "formats " + ", ".join(fmts)
         if required and not person.sign:
             out.append(_check("signing", label, "error", f"{person.label} has sign = false",
-                              f"set sign = true, run {PROG} apply"))
+                              f"set sign = true, run {PROG} setup"))
         elif person.sign and fmts and "ssh" not in fmts:
             out.append(_check("signing", label, "error", f"{PROG} signs with ssh but the policy allows {', '.join(fmts)}",
                               "sign with an allowed format outside gitpro"))
@@ -1114,7 +1114,7 @@ def identity_checks(cfg, person: _Person, pol: Policy, rules: Sequence[Rule], ke
                 shown = _tilde(pub)
                 reg = (keys or {}).get(pub) if online else None
                 if not os.path.isfile(pub):
-                    out.append(_check("signing key", shown, "error", f"{shown} not found", f"{PROG} keys --generate"))
+                    out.append(_check("signing key", shown, "error", f"{shown} not found", f"{PROG} setup"))
                 elif reg is True:
                     out.append(_check("signing key", shown, "ok", "registered as a signing key"))
                 elif reg is False:
@@ -1264,7 +1264,7 @@ def check_report(report) -> List[resolve.Problem]:
                                    f"use an address in {', '.join(doms)}" if doms else None))
     if any(r.require_signing for r in rules) and not report.expected.sign:
         out.append(resolve.Problem("policy", f"policy {pol.name} requires signed commits but identity {ident.id} has "
-                                             f"sign = false", f"set sign = true, run {PROG} apply"))
+                                             f"sign = false", f"set sign = true, run {PROG} setup"))
     return out
 
 

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/resolve.py

@@ -703,6 +703,15 @@ def _p(code: str, message: str, argv: Optional[Sequence[str]], fix: Optional[str
                    tuple(argv) if argv else None)
 
 
+# The fix when only gitpro's generated files settle it. setup needs a terminal (spec 22 §5.7), so it has no
+# argv a tool could run (spec 22 §10.5).
+SETUP = "gitpro setup"
+
+
+def _p_or_setup(code: str, message: str, argv: Optional[Sequence[str]]) -> Problem:
+    return _p(code, message, argv, None if argv else SETUP)
+
+
 _DEFAULT_PORT = {"ssh": 22, "https": 443, "http": 80}
 _CODECOMMIT = re.compile(r"^git-codecommit\.[a-z0-9-]+\.amazonaws\.com$", re.I)
 _Fix = Tuple[Optional[str], str, Identity, str, Optional[Tuple[str, str]]]
@@ -751,7 +760,7 @@ def _url_fixes(url: str, cfg: Config, label: str = "the remote") -> List[_Fix]:
         if port and port[1] != _DEFAULT_PORT[port[0]]:
             if port[0] == "ssh":
                 tail = f"it looks like {i.id}, whose patterns have no port {port[1]}"
-                fix = f"set ssh_port = {port[1]} on identity {i.id} in the gitpro config, then run: gitpro apply"
+                fix = f"set ssh_port = {port[1]} on identity {i.id} in the gitpro config, then run: gitpro setup"
                 if i.ssh_port:
                     fix += f" (it is {i.ssh_port} now; an identity has one ssh_port)"
             else:
@@ -761,7 +770,7 @@ def _url_fixes(url: str, cfg: Config, label: str = "the remote") -> List[_Fix]:
         if reason.endswith("user git@ in the URL") and is_codecommit(i.host):
             return [(None, reason, i, pat, (
                 f"it looks like {i.id}, but CodeCommit's SSH user is the SSH key ID, not git",
-                f'set ssh_user = "<your SSH key ID>" on identity {i.id} in the gitpro config, then run: gitpro apply'))]
+                f'set ssh_user = "<your SSH key ID>" on identity {i.id} in the gitpro config, then run: gitpro setup'))]
         return [(fixed, reason, i, pat, None)]
     from .render import url_patterns
     for i in cfg.identities:
@@ -835,8 +844,7 @@ def compare(repo: Path, cfg: Config, *, remote: Optional[str] = None,
 
     if exp.email is None:
         out.append(_p("no_identity", f"no identity for {redact_url(first_url) or top}",
-                      ["gitpro", "scan", "--suggest", "--repo", str(top)],
-                      f"add an identity: gitpro scan --suggest --repo {shlex.quote(str(top))}"))
+                      None, f"add an identity: gitpro setup --add {_word(str(top))}"))
 
     if exp.match.identity is None:
         for name, url in candidates:
@@ -872,23 +880,23 @@ def compare(repo: Path, cfg: Config, *, remote: Optional[str] = None,
     if beats:
         k, s = beats[0]
         out.append(_p("global_override", f"user.{k} comes from {_shown_origin(s, top)} ({s.scope}) and beats "
-                                         f"{who}; the generated include must come last", ["gitpro", "apply"]))
+                                         f"{who}; the generated include must come last", None, SETUP))
 
     home = Path.home() if home is None else Path(home)
     old = [k for k, s, want in (("name", eff.name, exp.name), ("email", eff.email, exp.email))
            if s.scope == "generated" and want is not None and s.value != want]
     if exp.file and not os.path.exists(exp.file):
-        out.append(_p("not_applied", f"{_tilde(exp.file)} does not exist; the config has not been applied",
-                      ["gitpro", "apply"]))
+        out.append(_p("not_applied", f"{_tilde(exp.file)} does not exist; the config has not been applied", None,
+                      SETUP))
     elif not _home_has_block(home):
-        out.append(_p("not_applied", "~/.gitconfig has no gitpro block; the config has not been applied",
-                      ["gitpro", "apply"]))
+        out.append(_p("not_applied", "~/.gitconfig has no gitpro block; the config has not been applied", None,
+                      SETUP))
     elif old:
         out.append(_p("not_applied", f"the generated files give user.{old[0]} "
                                      f"{getattr(eff, old[0]).value}; they are older than the config",
-                      ["gitpro", "apply"]))
+                      None, SETUP))
 
-    def fix_for(s: Setting, key: str) -> List[str]:
+    def fix_for(s: Setting, key: str) -> Optional[List[str]]:
         if s.scope in ("repo", "worktree"):
             return ["git", "-C", str(top), "config"] + (["--worktree"] if s.scope == "worktree" else []) \
                 + ["--unset", key]
@@ -896,7 +904,7 @@ def compare(repo: Path, cfg: Config, *, remote: Optional[str] = None,
             return ["git", "config", "--file", s.origin[5:], "--unset", key]
         if repin and s.scope in ("generated", "pin", None):
             return repin                    # the other identity's include decides it; a pin by remote overrides it
-        return ["gitpro", "apply"]
+        return None                         # setup rewrites the generated files (fix text SETUP)
 
     def own(s: Setting) -> str:
         # a value from the user's own config, outside gitpro's generated files
@@ -911,18 +919,19 @@ def compare(repo: Path, cfg: Config, *, remote: Optional[str] = None,
         if not _same_path(got, exp.ssh_key):
             msg = (f"core.sshcommand uses {_tilde(got)}{own(eff.sshcommand)}; {who} uses {_tilde(exp.ssh_key)}"
                    if got else f"core.sshcommand is not set; {who} uses {_tilde(exp.ssh_key)}")
-            out.append(_p("key_mismatch", msg, fix_for(eff.sshcommand, "core.sshCommand")))
+            out.append(_p_or_setup("key_mismatch", msg, fix_for(eff.sshcommand, "core.sshCommand")))
 
     sign_now = _bool(eff.gpgsign.value)
     if sign_now != exp.sign:
-        out.append(_p("sign_mismatch", f"commit.gpgsign is {'true' if sign_now else 'false'}{own(eff.gpgsign)}; {who} "
-                                       f"{'signs' if exp.sign else 'does not sign'} commits",
-                      fix_for(eff.gpgsign, "commit.gpgsign")))
+        out.append(_p_or_setup("sign_mismatch", f"commit.gpgsign is {'true' if sign_now else 'false'}"
+                                                f"{own(eff.gpgsign)}; {who} "
+                                                f"{'signs' if exp.sign else 'does not sign'} commits",
+                               fix_for(eff.gpgsign, "commit.gpgsign")))
     elif exp.sign and exp.signingkey and not _same_path(eff.signingkey.value, exp.signingkey):
-        out.append(_p("sign_mismatch", f"user.signingkey is {_tilde(eff.signingkey.value) or '(unset)'}"
-                                       f"{own(eff.signingkey)}; {who} "
-                                       f"signs with {_tilde(exp.signingkey)}",
-                      fix_for(eff.signingkey, "user.signingkey")))
+        out.append(_p_or_setup("sign_mismatch", f"user.signingkey is {_tilde(eff.signingkey.value) or '(unset)'}"
+                                                f"{own(eff.signingkey)}; {who} "
+                                                f"signs with {_tilde(exp.signingkey)}",
+                               fix_for(eff.signingkey, "user.signingkey")))
 
     envp = _env_problem(exp, eff, env)
     if envp:
@@ -970,19 +979,21 @@ def _shown_origin(s: Setting, top: Path) -> str:
     return _tilde(path)
 
 
+def _word(a: str) -> str:
+    """a shell-quoted, with the home folder shown as ~."""
+    home = str(Path.home())
+    if a.startswith(home + "/"):
+        return "~/" + shlex.quote(a[len(home) + 1:])
+    return shlex.quote(a)
+
+
 def _shown_fix(p: Problem) -> str:
     if not p.fix_argv:
         return p.fix or ""
-    home = str(Path.home())
-
-    def word(a: str) -> str:
-        if a.startswith(home + "/"):
-            return "~/" + shlex.quote(a[len(home) + 1:])
-        return shlex.quote(a)
     # keep a leading explanation ("add an identity: ") that the argv itself does not carry
     cut = (p.fix or "").find(p.fix_argv[0])
     prefix = p.fix[:cut] if cut > 0 else ""
-    return prefix + " ".join(word(a) for a in p.fix_argv)
+    return prefix + " ".join(_word(a) for a in p.fix_argv)
 
 
 def render_text(rep: Report, cfg: Config) -> str:

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/tui.py

@@ -46,7 +46,7 @@ class Suggestion(ModalScreen[None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(classes="dialog"):
-            yield Static("To keep this identity, paste the block into your config and run 'gitpro apply'. "
+            yield Static("To keep this identity, paste the block into your config and run 'gitpro setup'. "
                          "The repos it matches then keep it after the fix.\n")
             yield Static(Syntax(self.toml, "toml", theme="ansi_dark", background_color="default"))
             yield Footer()

{gitpro-0.4.1 → gitpro-0.4.3}/src/gitpro/view.py

@@ -131,7 +131,7 @@ def scan(rep: dict, show: Callable[[str], str], *, verbose: bool, suggest: bool,
             out.print(f"\n# {show(path)} ({r['owner']}): no identity can match it; after fixing it uses {who(r['after'])}",
                       markup=False, soft_wrap=True)
     elif rep["suggestions"] and not fix:
-        out.print(Text(f"\nto keep some of these identities instead: {prog} scan --suggest", style="dim"), soft_wrap=True)
+        out.print(Text(f"\nto keep some of these identities instead: {prog} setup --add", style="dim"), soft_wrap=True)
 
     if not fix:
         settings = sum(len(r["fixable"]) for r in over)