gitbolt 0.0.0.dev22__tar.gz → 0.0.0.dev23__tar.gz

{gitbolt-0.0.0.dev22 → gitbolt-0.0.0.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitbolt
-Version: 0.0.0.dev22
+Version: 0.0.0.dev23
 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.dev22 → gitbolt-0.0.0.dev23}/pyproject.toml

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

{gitbolt-0.0.0.dev22 → gitbolt-0.0.0.dev23}/src/gitbolt/subprocess/base.py

@@ -56,6 +56,35 @@ class GitCommand(Git, ABC):
 
         For example, ``--no-pager --no-advice`` is the git main command in ``git --no-pager --no-advice log master -1``.
 
+        Examples:
+
+        - No CLI args to build
+
+        >>> import gitbolt
+        >>> _git = gitbolt.get_git_command()
+        >>> assert _git.build_main_cmd_args() == []
+
+        - One CLI arg to override
+
+        >>> _git = gitbolt.get_git_command()
+        >>> _m_git = _git.git_opts_override(C=[Path("dir/my/dir")])
+        >>> _o_git = _m_git.git_opts_override(C=[Path("other/dir")])
+        >>> assert _o_git.build_main_cmd_args() == ["-C", str(Path("other/dir"))]
+
+        - Multiple CLI args to override
+
+        >>> _git = gitbolt.get_git_command()
+        >>> _m_git = _git.git_opts_override(C=[Path("dir/my/dir")], config_env=dict(u1="user1", u2="user2"))
+        >>> _o_git = _m_git.git_opts_override(C=[Path("other/dir")])
+        >>> assert _o_git.build_main_cmd_args() == ["-C", str(Path("other/dir")), "--config-env", "u1=user1", "--config-env", "u2=user2"]
+
+        - Multiple CLI args to override when CLI is preferred
+
+        >>> _git = gitbolt.get_git_command(prefer_cli=True)
+        >>> _m_git = _git.git_opts_override(C=[Path("dir/my/dir")], config_env=dict(u1="user1", u2="user2"))
+        >>> _o_git = _m_git.git_opts_override(C=[Path("other/dir")])
+        >>> assert _o_git.build_main_cmd_args() == ["-C", str(Path("other/dir")), "--config-env", "u1=user1", "--config-env", "u2=user2"]
+
         :return: CLI args for git main cli command.
         """
         return (

{gitbolt-0.0.0.dev22 → gitbolt-0.0.0.dev23}/src/gitbolt/subprocess/impl/simple.py

@@ -14,7 +14,7 @@ from typing import override, Literal, overload, Callable
 
 from vt.utils.commons.commons.op import RootDirOp
 
-from gitbolt.base import Version, Worktree
+from gitbolt.base import Version
 from gitbolt.add import AddArgsValidator
 from gitbolt.subprocess import (
     GitCommand,
@@ -31,6 +31,7 @@ from gitbolt.subprocess.ls_tree import LsTreeCLIArgsBuilder
 from gitbolt.subprocess.runner import GitCommandRunner
 from gitbolt.subprocess.runner.simple import SimpleGitCR
 from gitbolt.ls_tree import LsTreeArgsValidator
+from gitbolt.subprocess.utils.main_cmd import git_main_opts_clean_cap_c
 from gitbolt.subprocess.worktree import WorktreeCLIArgsBuilder
 
 
@@ -452,12 +453,16 @@ class CLISimpleGitCommand(SimpleGitCommand):
 
     @override
     def build_main_cmd_args(self) -> list[str]:
+        super_cli_cmd_opts = super().build_main_cmd_args()
         if self._main_cmd_cli_opts:
+            if "-C" in self._main_cmd_cli_opts:
+                # only need to clean -C from the original CLI opts if the main CLI opts have them.
+                super_cli_cmd_opts = git_main_opts_clean_cap_c(super_cli_cmd_opts)
             if self.prefer_cli:
-                return super().build_main_cmd_args() + self._main_cmd_cli_opts
+                return super_cli_cmd_opts + self._main_cmd_cli_opts
             else:
-                return self._main_cmd_cli_opts + super().build_main_cmd_args()
-        return super().build_main_cmd_args()
+                return self._main_cmd_cli_opts + super_cli_cmd_opts
+        return super_cli_cmd_opts
 
     @override
     def build_git_envs(self) -> dict[str, str] | None:

gitbolt-0.0.0.dev22/src/gitbolt/subprocess/utils/cmd.py → gitbolt-0.0.0.dev23/src/gitbolt/subprocess/utils/main_cmd.py

@@ -177,3 +177,40 @@ def git_main_cmd_pair_flag_args(val: Any, cmd_flag: str) -> list[str]:
         []
     """
     return [cmd_flag, str(val)] if not_none_not_unset(val) else []
+
+
+def git_main_opts_clean_cap_c(main_opts: list[str]) -> list[str]:
+    """
+    Clean the cap C of -C CLI options from the CLI command list. This function removes the ``-C`` CLI option and its
+    values from the supplied param list.
+
+    >>> assert git_main_opts_clean_cap_c([]) == []
+
+    >>> assert git_main_opts_clean_cap_c(["--no-pager"]) == ["--no-pager"]
+
+    >>> assert git_main_opts_clean_cap_c(["--no-pager", "-C", "/root", "-C", "dir", "-C", "file"]) == ["--no-pager"]
+
+    >>> assert git_main_opts_clean_cap_c(["-C", "/root", "-C", "dir", "-C", "file", "--no-pager"]) == ["--no-pager"]
+
+    >>> assert git_main_opts_clean_cap_c(["-C", "/root", "-C", "dir", "--no-pager", "-C", "file"]) == ["--no-pager"]
+
+    >>> assert git_main_opts_clean_cap_c(["-C", "/root", "-C", "dir", "-C", "file"]) == []
+
+    :param main_opts: git CLI command options.
+    :returns: command line options after removing -C options and its values.
+    """
+    cap_c_indices: list[int] = []
+    main_opts_copy = main_opts.copy()
+    try:
+        i=0
+        while i<len(main_opts):
+            found_index = main_opts_copy.index("-C", i)
+            cap_c_indices.append(found_index)
+            i=found_index+1
+    except ValueError:
+        # didn't find -C or done finding -C
+        pass
+    for cap_c_index in reversed(cap_c_indices):
+        del main_opts_copy[cap_c_index+1]
+        del main_opts_copy[cap_c_index]
+    return main_opts_copy

{gitbolt-0.0.0.dev22 → gitbolt-0.0.0.dev23}/src/gitbolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitbolt
-Version: 0.0.0.dev22
+Version: 0.0.0.dev23
 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.dev22 → gitbolt-0.0.0.dev23}/src/gitbolt.egg-info/SOURCES.txt

@@ -32,6 +32,6 @@ src/gitbolt/subprocess/runner/__init__.py
 src/gitbolt/subprocess/runner/base.py
 src/gitbolt/subprocess/runner/simple.py
 src/gitbolt/subprocess/utils/__init__.py
-src/gitbolt/subprocess/utils/cmd.py
+src/gitbolt/subprocess/utils/main_cmd.py
 src/gitbolt/subprocess/utils/models.py
 src/gitbolt/subprocess/utils/session.py