gitpro 0.3.2__tar.gz → 0.3.3__tar.gz

{gitpro-0.3.2 → gitpro-0.3.3}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.5
 Name: gitpro
-Version: 0.3.2
+Version: 0.3.3
 Summary: Per-remote git identities (name, email, SSH key, commit signing) from one TOML file
-Project-URL: Homepage, https://github.com/Yantrakar/gitpro
+Project-URL: Homepage, https://gitpro.dev
+Project-URL: Source, https://github.com/Yantrakar/gitpro
 Project-URL: Documentation, https://github.com/Yantrakar/gitpro/blob/main/docs/guide.md
 Project-URL: Issues, https://github.com/Yantrakar/gitpro/issues
+Project-URL: VS Code extension, https://marketplace.visualstudio.com/items?itemName=yantrakar.gitpro
 Author: Yantrakar, Sandeep Shelke
 License-Expression: MIT
 License-File: LICENSE
@@ -22,10 +24,16 @@ Provides-Extra: tui
 Requires-Dist: textual>=0.80; extra == 'tui'
 Description-Content-Type: text/markdown
 
+<a href="https://gitpro.dev"><img src="https://gitpro.dev/icon.png" alt="gitpro" width="72" height="72"></a>
+
 # gitpro
 
+<!-- mcp-name: io.github.Yantrakar/gitpro -->
+
 **The right Git identity, SSH key and signature for every repository.**
 
+[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)
+
 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.

{gitpro-0.3.2 → gitpro-0.3.3}/README.md

@@ -1,7 +1,13 @@
+<a href="https://gitpro.dev"><img src="https://gitpro.dev/icon.png" alt="gitpro" width="72" height="72"></a>
+
 # gitpro
 
+<!-- mcp-name: io.github.Yantrakar/gitpro -->
+
 **The right Git identity, SSH key and signature for every repository.**
 
+[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)
+
 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.

{gitpro-0.3.2 → gitpro-0.3.3}/pyproject.toml

@@ -26,9 +26,11 @@ classifiers = [
 tui = ["textual>=0.80"]  # interactive scan --fix
 
 [project.urls]
-Homepage = "https://github.com/Yantrakar/gitpro"
+Homepage = "https://gitpro.dev"
+Source = "https://github.com/Yantrakar/gitpro"
 Documentation = "https://github.com/Yantrakar/gitpro/blob/main/docs/guide.md"
 Issues = "https://github.com/Yantrakar/gitpro/issues"
+"VS Code extension" = "https://marketplace.visualstudio.com/items?itemName=yantrakar.gitpro"
 
 [project.scripts]
 gitpro = "gitpro.hot:main"

{gitpro-0.3.2 → gitpro-0.3.3}/src/gitpro/__init__.py

@@ -1,4 +1,4 @@
 """Per-remote git identities generated from one TOML file (see cli.py)."""
 from __future__ import annotations
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"

{gitpro-0.3.2 → gitpro-0.3.3}/src/gitpro/config.py

@@ -24,7 +24,7 @@ _LABEL = r"[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?"
 HOST_RE = re.compile(rf"^{_LABEL}(?:\.{_LABEL})*$")
 ID_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._-]*$")
 USER_RE = ID_RE
-OWNER_RE = re.compile(r"^[A-Za-z0-9*][A-Za-z0-9._*-]*(?:/[A-Za-z0-9*][A-Za-z0-9._*-]*)*$")
+OWNER_RE = re.compile(r"^~?[A-Za-z0-9*][A-Za-z0-9._*-]*(?:/[A-Za-z0-9*][A-Za-z0-9._*-]*)*$")  # ~: SourceHut users
 PATH_RE = re.compile(r"^(?:~/|/)[A-Za-z0-9._/@+-]+$")
 EMAIL_RE = re.compile(r'^[^@\s<>"]+@[^@\s<>"]+$')
 CONTROL_RE = re.compile(r"[\x00-\x08\x0a-\x1f\x7f]")

{gitpro-0.3.2 → gitpro-0.3.3}/src/gitpro/discover.py

@@ -1228,7 +1228,7 @@ def render_toml(d: dict) -> str:
                 notes.append(f"{where}: already in config" + (f" (identity {o['config_id']})" if o.get("config_id") else ""))
                 continue
             if not OWNER_RE.match(o["owner"]):
-                notes.append(f"{where}: owners can hold only A-Z a-z 0-9 . _ - /; add it by hand if it is yours")
+                notes.append(f"{where}: owners can hold only A-Z a-z 0-9 . _ - / and a leading ~; add it by hand if it is yours")
                 continue
             rule = o.get("rule") or {}
             email = _top(o.get("emails"), _usable_email)[0]

{gitpro-0.3.2 → gitpro-0.3.3}/src/gitpro/lint.py

@@ -7,11 +7,14 @@ import subprocess
 from . import keys, render
 from .config import Default, Identity
 from .plan import Env
+from .resolve import is_codecommit
 
 
 def warnings(d: Default, ids: list[Identity], env: Env) -> list[str]:
     out = []
     for i in ids:
+        if is_codecommit(i.host) and i.ssh_user == "git" and (i.ssh_key or i.ssh_alias):
+            out.append(f"identity {i.id!r}: CodeCommit's SSH user is the SSH key ID, not git; set ssh_user to it")
         if i.ssh_alias and i.rewrite:
             out += [f"identity {i.id!r}: owner {o!r} is a glob; insteadOf needs a literal prefix, so "
                     f"its URLs aren't rewritten to {i.ssh_alias}" for o in i.owners if "*" in o]

{gitpro-0.3.2 → gitpro-0.3.3}/src/gitpro/resolve.py

@@ -607,28 +607,75 @@ def _p(code: str, message: str, argv: Optional[Sequence[str]], fix: Optional[str
                    tuple(argv) if argv else None)
 
 
-def _url_fixes(url: str, cfg: Config) -> List[Tuple[str, str, Identity, str]]:
-    """[(fixed url, reason, identity, pattern)] for the three repairs, in order: userinfo removed,
-    missing user added, port removed. First repair that makes some identity match wins."""
-    tries: List[Tuple[str, str]] = []
+_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]]]
+
+
+def is_codecommit(host: str) -> bool:
+    return bool(_CODECOMMIT.match(host))
+
+
+def _repairs(url: str, users: List[str]) -> List[Tuple[str, str, Optional[Tuple[str, int]]]]:
+    tries: List[Tuple[str, str, Optional[Tuple[str, int]]]] = []
     m = re.match(r"^(https?://)[^@/]+@(.*)$", url)
     if m:
-        tries.append((m[1] + m[2], "no user in the URL"))
-    users = list(dict.fromkeys(i.ssh_user for i in cfg.identities)) or ["git"]
+        tries.append((m[1] + m[2], "no user in the URL", None))
     m = re.match(r"^ssh://([^@/]+)(/.*)$", url)
     if m:
-        tries += [(f"ssh://{u}@{m[1]}{m[2]}", f"user {u}@ in the URL") for u in users]
+        tries += [(f"ssh://{u}@{m[1]}{m[2]}", f"user {u}@ in the URL", None) for u in users]
     elif "://" not in url:
         m = _SCP_RE.match(url)
         if m and m[1] is None and "/" not in url.split(":", 1)[0]:
-            tries += [(f"{u}@{url}", f"user {u}@ in the URL") for u in users]
-    m = re.match(r"^((?:ssh|https?)://[^/]*?):\d+(/.*)$", url)
+            tries += [(f"{u}@{url}", f"user {u}@ in the URL", None) for u in users]
+    m = re.match(r"^((ssh|https?)://[^/]*?):(\d+)(/.*)$", url)
     if m:
-        tries.append((m[1] + m[2], "no port in the URL"))
-    for fixed, reason in tries:
+        tries.append((m[1] + m[4], "no port in the URL", (m[2], int(m[3]))))
+    return tries
+
+
+def _url_fixes(url: str, cfg: Config, label: str = "the remote") -> List[_Fix]:
+    """[(fixed url, reason, identity, pattern, note)] for the repairs, in order: git+ssh:// or ssh+git://
+    written as ssh://, then (on that url) userinfo removed, missing user added, port removed, then
+    letter case changed to an identity's. First repair that makes some identity match wins. When the
+    fixed url would point at the wrong place (a non-default port removed, user git on CodeCommit),
+    fixed is None and note is (message tail, fix text) instead."""
+    users = list(dict.fromkeys(i.ssh_user for i in cfg.identities)) or ["git"]
+    tries: List[Tuple[str, str, Optional[Tuple[str, int]]]] = []
+    m = re.match(r"^(git\+ssh|ssh\+git)://(.*)$", url)
+    if m:
+        pre = f"ssh:// instead of {m[1]}://"
+        tries.append((f"ssh://{m[2]}", pre, None))
+        tries += [(f, f"{pre}, {r}", p) for f, r, p in _repairs(f"ssh://{m[2]}", users)]
+    tries += _repairs(url, users)
+    for fixed, reason, port in tries:
         i, pat = match_url(fixed, cfg)
-        if i is not None:
-            return [(fixed, reason, i, pat)]
+        if i is None:
+            continue
+        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"
+                if i.ssh_port:
+                    fix += f" (it is {i.ssh_port} now; an identity has one ssh_port)"
+            else:
+                tail = f"it looks like {i.id}, but gitpro's https patterns never carry a port"
+                fix = f"switch {label} to an ssh URL for {i.id}"
+            return [(None, reason, i, pat, (tail, 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'))]
+        return [(fixed, reason, i, pat, None)]
+    from .render import url_patterns
+    for i in cfg.identities:
+        for pat in url_patterns(i):
+            prefix = pat.split("*", 1)[0]
+            if url.lower().startswith(prefix.lower()) and not url.startswith(prefix):
+                fixed = prefix + url[len(prefix):]
+                j, jpat = match_url(fixed, cfg)
+                if j is not None:
+                    return [(fixed, "letter case differs; git matches case-sensitively", j, jpat, None)]
     return []
 
 
@@ -686,9 +733,12 @@ def compare(repo: Path, cfg: Config, *, remote: Optional[str] = None,
 
     if exp.match.identity is None:
         for name, url in candidates:
-            fixes = _url_fixes(url, cfg)
+            fixes = _url_fixes(url, cfg, name or "the remote")
             if fixes:
-                fixed, reason, i, pat = fixes[0]
+                fixed, reason, i, pat, note = fixes[0]
+                if note:
+                    out.append(_p("url_form", f"{name or 'the remote'} is {redact_url(url)}; {note[0]}", None, note[1]))
+                    break
                 argv = ["git", "-C", str(top), "remote", "set-url", name, fixed] \
                     if name and remote_url is None else None
                 need = pat.replace("**", "…")