gitbolt 0.0.0.dev24__tar.gz → 0.0.0.dev26__tar.gz

{gitbolt-0.0.0.dev24 → gitbolt-0.0.0.dev26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitbolt
-Version: 0.0.0.dev24
+Version: 0.0.0.dev26
 Summary: Fast, flexible and type-safe Git commands in Python.
 Author-email: Suhas Krishna Srivastava <suhas.srivastava@vaastav.tech>
 Maintainer-email: Suhas Krishna Srivastava <suhas.srivastava@vaastav.tech>

{gitbolt-0.0.0.dev24 → gitbolt-0.0.0.dev26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gitbolt"
-version = "0.0.0.dev24"
+version = "0.0.0.dev26"
 description = "Fast, flexible and type-safe Git commands in Python."
 requires-python = ">=3.12"
 readme = "README.md"

{gitbolt-0.0.0.dev24 → gitbolt-0.0.0.dev26}/src/gitbolt/subprocess/base.py

@@ -50,6 +50,28 @@ class GitCommand(Git, ABC):
         self._main_cmd_opts: GitOpts = {}
         self._env_vars: GitEnvVars | None = None
         self._cmd_str_repr: str | None = None
+        self._main_cmd_opt_builders: dict[str, Callable[[], list[str]]] = {
+            "C": self._main_cmd_cap_c_args,
+            "c": self._main_cmd_small_c_args,
+            "config_env": self._main_cmd_config_env_args,
+            "exec_path": self._main_cmd_exec_path_args,
+            "paginate": self._main_cmd_paginate_args,
+            "no_pager": self._main_cmd_no_pager_args,
+            "git_dir": self._main_cmd_git_dir_args,
+            "work_tree": self._main_cmd_work_tree_args,
+            "namespace": self._main_cmd_namespace_args,
+            "bare": self._main_cmd_bare_args,
+            "no_replace_objects": self._main_cmd_no_replace_objects_args,
+            "no_lazy_fetch": self._main_cmd_no_lazy_fetch_args,
+            "no_optional_locks": self._main_cmd_no_optional_locks_args,
+            "no_advice": self._main_cmd_no_advice_args,
+            "literal_pathspecs": self._main_cmd_literal_pathspecs_args,
+            "glob_pathspecs": self._main_cmd_glob_pathspecs_args,
+            "noglob_pathspecs": self._main_cmd_noglob_pathspecs_args,
+            "icase_pathspecs": self._main_cmd_icase_pathspecs_args,
+            "list_cmds": self._main_cmd_list_cmds_args,
+            "attr_source": self._main_cmd_attr_source_args,
+        }
 
     @override
     def __str__(self) -> str:
@@ -65,7 +87,7 @@ class GitCommand(Git, ABC):
 
         >>> _b_git = _a_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True)
         >>> assert str(_a_git) == GIT_CMD    # _a_git never changed
-        >>> assert str(_b_git) == f"{GIT_CMD} -C a -C b --no-replace-objects --no-advice"
+        >>> assert str(_b_git) == f"{GIT_CMD} -C a -C b --no-advice --no-replace-objects"
 
         Adding git envs:
 
@@ -74,7 +96,7 @@ class GitCommand(Git, ABC):
         >>> assert str(_c_git) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD}"
 
         >>> _d_git = _c_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True, config_env=dict(conf1="val1", glob1="val2"))
-        >>> assert str(_d_git) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --config-env conf1=val1 --config-env glob1=val2 --no-replace-objects --no-advice"
+        >>> assert str(_d_git) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --no-advice --no-replace-objects --config-env conf1=val1 --config-env glob1=val2"
 
         Does not affect repr:
 
@@ -127,28 +149,14 @@ class GitCommand(Git, ABC):
 
         :return: CLI args for git main cli command.
         """
-        return (
-            self._main_cmd_cap_c_args()
-            + self._main_cmd_small_c_args()
-            + self._main_cmd_config_env_args()
-            + self._main_cmd_exec_path_args()
-            + self._main_cmd_paginate_args()
-            + self._main_cmd_no_pager_args()
-            + self._main_cmd_git_dir_args()
-            + self._main_cmd_work_tree_args()
-            + self._main_cmd_namespace_args()
-            + self._main_cmd_bare_args()
-            + self._main_cmd_no_replace_objects_args()
-            + self._main_cmd_no_lazy_fetch_args()
-            + self._main_cmd_no_optional_locks_args()
-            + self._main_cmd_no_advice_args()
-            + self._main_cmd_literal_pathspecs_args()
-            + self._main_cmd_glob_pathspecs_args()
-            + self._main_cmd_noglob_pathspecs_args()
-            + self._main_cmd_icase_pathspecs_args()
-            + self._main_cmd_list_cmds_args()
-            + self._main_cmd_attr_source_args()
-        )
+        args: list[str] = []
+        for opt_key in self._main_cmd_opts:
+            args.extend(self._main_cmd_args_for_opt_key(opt_key))
+        return args
+
+    def _main_cmd_args_for_opt_key(self, opt_key: str) -> list[str]:
+        builder = self._main_cmd_opt_builders.get(opt_key)
+        return builder() if builder else []
 
     @override
     def git_opts_override(self, **overrides: Unpack[GitOpts]) -> Self:
@@ -686,7 +694,7 @@ class VersionCommand(Version, GitSubcmdCommand, Protocol):
 
         >>> _b_git = _a_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True)
         >>> assert str(_a_git.version_subcmd()) == f"{GIT_CMD} {VERSION_CMD}"    # _a_git never changed
-        >>> assert str(_b_git.version_subcmd()) == f"{GIT_CMD} -C a -C b --no-replace-objects --no-advice {VERSION_CMD}"
+        >>> assert str(_b_git.version_subcmd()) == f"{GIT_CMD} -C a -C b --no-advice --no-replace-objects {VERSION_CMD}"
 
         Adding git envs:
 
@@ -695,7 +703,7 @@ class VersionCommand(Version, GitSubcmdCommand, Protocol):
         >>> assert str(_c_git.version_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} {VERSION_CMD}"
 
         >>> _d_git = _c_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True, config_env=dict(conf1="val1", glob1="val2"))
-        >>> assert str(_d_git.version_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --config-env conf1=val1 --config-env glob1=val2 --no-replace-objects --no-advice {VERSION_CMD}"
+        >>> assert str(_d_git.version_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --no-advice --no-replace-objects --config-env conf1=val1 --config-env glob1=val2 {VERSION_CMD}"
 
         Does not affect repr:
 
@@ -756,7 +764,7 @@ class LsTreeCommand(LsTree, GitSubcmdCommand, Protocol):
 
         >>> _b_git = _a_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True)
         >>> assert str(_a_git.ls_tree_subcmd()) == f"{GIT_CMD} {LS_TREE_CMD}"    # _a_git never changed
-        >>> assert str(_b_git.ls_tree_subcmd()) == f"{GIT_CMD} -C a -C b --no-replace-objects --no-advice {LS_TREE_CMD}"
+        >>> assert str(_b_git.ls_tree_subcmd()) == f"{GIT_CMD} -C a -C b --no-advice --no-replace-objects {LS_TREE_CMD}"
 
         Adding git envs:
 
@@ -765,7 +773,7 @@ class LsTreeCommand(LsTree, GitSubcmdCommand, Protocol):
         >>> assert str(_c_git.ls_tree_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} {LS_TREE_CMD}"
 
         >>> _d_git = _c_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True, config_env=dict(conf1="val1", glob1="val2"))
-        >>> assert str(_d_git.ls_tree_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --config-env conf1=val1 --config-env glob1=val2 --no-replace-objects --no-advice {LS_TREE_CMD}"
+        >>> assert str(_d_git.ls_tree_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --no-advice --no-replace-objects --config-env conf1=val1 --config-env glob1=val2 {LS_TREE_CMD}"
 
         Does not affect repr:
 
@@ -871,7 +879,7 @@ class AddCommand(Add, GitSubcmdCommand, Protocol):
 
         >>> _b_git = _a_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True)
         >>> assert str(_a_git.add_subcmd()) == f"{GIT_CMD} {ADD_CMD}"    # _a_git never changed
-        >>> assert str(_b_git.add_subcmd()) == f"{GIT_CMD} -C a -C b --no-replace-objects --no-advice {ADD_CMD}"
+        >>> assert str(_b_git.add_subcmd()) == f"{GIT_CMD} -C a -C b --no-advice --no-replace-objects {ADD_CMD}"
 
         Adding git envs:
 
@@ -880,7 +888,7 @@ class AddCommand(Add, GitSubcmdCommand, Protocol):
         >>> assert str(_c_git.add_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} {ADD_CMD}"
 
         >>> _d_git = _c_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True, config_env=dict(conf1="val1", glob1="val2"))
-        >>> assert str(_d_git.add_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --config-env conf1=val1 --config-env glob1=val2 --no-replace-objects --no-advice {ADD_CMD}"
+        >>> assert str(_d_git.add_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --no-advice --no-replace-objects --config-env conf1=val1 --config-env glob1=val2 {ADD_CMD}"
 
         Does not affect repr:
 
@@ -1193,7 +1201,7 @@ class WorktreeCommand(Worktree, GitSubcmdCommand, abc.ABC):
 
         >>> _b_git = _a_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True)
         >>> assert str(_a_git.worktree_subcmd()) == f"{GIT_CMD} {WORKTREE_CMD}"    # _a_git never changed
-        >>> assert str(_b_git.worktree_subcmd()) == f"{GIT_CMD} -C a -C b --no-replace-objects --no-advice {WORKTREE_CMD}"
+        >>> assert str(_b_git.worktree_subcmd()) == f"{GIT_CMD} -C a -C b --no-advice --no-replace-objects {WORKTREE_CMD}"
 
         Adding git envs:
 
@@ -1202,7 +1210,7 @@ class WorktreeCommand(Worktree, GitSubcmdCommand, abc.ABC):
         >>> assert str(_c_git.worktree_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} {WORKTREE_CMD}"
 
         >>> _d_git = _c_git.git_opts_override(C=[Path("a"), Path("b")], no_advice=True, no_replace_objects=True, config_env=dict(conf1="val1", glob1="val2"))
-        >>> assert str(_d_git.worktree_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --config-env conf1=val1 --config-env glob1=val2 --no-replace-objects --no-advice {WORKTREE_CMD}"
+        >>> assert str(_d_git.worktree_subcmd()) == f"GIT_ADVICE=False GIT_AUTHOR_NAME=Suhas GIT_PAGER=vi {GIT_CMD} -C a -C b --no-advice --no-replace-objects --config-env conf1=val1 --config-env glob1=val2 {WORKTREE_CMD}"
 
         Does not affect repr:
 

{gitbolt-0.0.0.dev24 → gitbolt-0.0.0.dev26}/src/gitbolt/subprocess/impl/simple.py

@@ -387,7 +387,13 @@ class SimpleGitCommand(GitCommand, RootDirOp):
 
     @override
     def worktree_subcmd(self) -> WorktreeCommand:
-        warnings.warn("Worktree implementations are not stable.")
+        warnings.warn("Worktree implementations are not stable. Use subcmd_unchecked instead.")
+        return self._worktree_subcmd_clone()
+
+    def _worktree_subcmd_clone(self) -> WorktreeCommand:
+        """
+        Non public-facing worktree clone extract.
+        """
         worktree_subcmd = self._worktree_subcmd.clone()
         worktree_subcmd._set_underlying_git(self)
         return worktree_subcmd
@@ -400,7 +406,7 @@ class SimpleGitCommand(GitCommand, RootDirOp):
             version_subcmd=self.version_subcmd(),
             ls_tree_subcmd=self.ls_tree_subcmd(),
             add_subcmd=self.add_subcmd(),
-            worktree_subcmd=self.worktree_subcmd(),
+            worktree_subcmd=self._worktree_subcmd_clone(),
             subcmd_unchecked=self.subcmd_unchecked(),
         )
 
@@ -508,6 +514,6 @@ class CLISimpleGitCommand(SimpleGitCommand):
             version_subcmd=self.version_subcmd(),
             ls_tree_subcmd=self.ls_tree_subcmd(),
             add_subcmd=self.add_subcmd(),
-            worktree_subcmd=self.worktree_subcmd(),
+            worktree_subcmd=self._worktree_subcmd_clone(),
             subcmd_unchecked=self.subcmd_unchecked(),
         )

{gitbolt-0.0.0.dev24 → gitbolt-0.0.0.dev26}/src/gitbolt/utils.py

@@ -7,6 +7,7 @@ Utility functions related to processors specific to git commands.
 
 from __future__ import annotations
 
+from vt.utils.commons.commons.core_py import is_unset
 
 from gitbolt.models import GitOpts, GitEnvVars
 
@@ -86,7 +87,7 @@ def merge_git_opts(primary: GitOpts, fallback: GitOpts) -> GitOpts:
         fallbacks on the corresponding property from the ``fallback`` ``GitOpts`` object if that corresponding property
         is ``None`` in the ``primary`` ``GitOpts`` object.
     """
-    return merge_typed_dicts(primary, fallback, GitOpts)
+    return merge_typed_dicts(primary, fallback, GitOpts, omit_unset_keys=True)
 
 
 def merge_git_envs(primary: GitEnvVars, fallback: GitEnvVars) -> GitEnvVars:
@@ -164,16 +165,51 @@ def merge_git_envs(primary: GitEnvVars, fallback: GitEnvVars) -> GitEnvVars:
         fallbacks on the corresponding property from the ``fallback`` ``GitEnvVars`` object if that corresponding property
         is explicitly ``None`` in the ``primary`` ``GitEnvVars`` object.
     """
-    return merge_typed_dicts(primary, fallback, GitEnvVars)
+    return merge_typed_dicts(primary, fallback, GitEnvVars, omit_unset_keys=False)
 
 
 # TODO: check for typing this function
-def merge_typed_dicts(primary, fallback, the_typed_dict):
-    merged = {}
-    for k in the_typed_dict.__annotations__.keys():  # type: ignore
-        val = primary.get(k)  # type: ignore # required as mypy thinks k is not str
+def merge_typed_dicts(
+    primary, fallback, the_typed_dict, *, omit_unset_keys: bool = False
+):
+    """
+    Merge typed dicts preserving insertion order of ``fallback`` then new keys from ``primary``.
+
+    Value resolution matches the previous annotation-order merge: primary wins, ``None`` in primary
+    falls back, ``Unset`` is kept for env merges and omitted from opts when ``omit_unset_keys`` is True.
+    """
+    valid_keys = frozenset(the_typed_dict.__annotations__.keys())
+
+    keys_order: list[str] = []
+    seen: set[str] = set()
+    for k in fallback:
+        if k in valid_keys and k not in seen:
+            keys_order.append(k)
+            seen.add(k)
+    for k in primary:
+        if k in valid_keys and k not in seen:
+            keys_order.append(k)
+            seen.add(k)
+
+    merged: dict = {}
+    for k in keys_order:
+        if k in primary and is_unset(primary[k]):
+            if omit_unset_keys:
+                continue
+            merged[k] = primary[k]
+            continue
+
+        if k in primary:
+            val = primary[k]
+            if val is None:
+                val = fallback.get(k)
+        else:
+            val = fallback.get(k)
+
         if val is None:
-            val = fallback.get(k)  # type: ignore # required as mypy thinks k is not str
-        if val is not None:
-            merged[k] = val  # type: ignore # required as mypy thinks k is not str
+            continue
+        if omit_unset_keys and is_unset(val):
+            continue
+        merged[k] = val
+
     return merged

{gitbolt-0.0.0.dev24 → gitbolt-0.0.0.dev26}/src/gitbolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitbolt
-Version: 0.0.0.dev24
+Version: 0.0.0.dev26
 Summary: Fast, flexible and type-safe Git commands in Python.
 Author-email: Suhas Krishna Srivastava <suhas.srivastava@vaastav.tech>
 Maintainer-email: Suhas Krishna Srivastava <suhas.srivastava@vaastav.tech>