refactor!: Move libvcs.util -> libvcs.cmd.core

Author: tony

docs/states/index.md

@@ -45,6 +45,6 @@ See examples below of git, mercurial, and subversion.
 ## Utility stuff
 
 ```{eval-rst}
-.. automodule:: libvcs.util
+.. automodule:: libvcs.cmd.core
    :members:
 ```

libvcs/__init__.py

@@ -1,11 +1,11 @@
 """Repo package for libvcs."""
 import logging
 
+from .cmd.core import CmdLoggingAdapter
 from .states.base import BaseRepo
 from .states.git import GitRepo
 from .states.hg import MercurialRepo
 from .states.svn import SubversionRepo
-from .util import CmdLoggingAdapter
 
 __all__ = [
     "GitRepo",

libvcs/util.py renamed to libvcs/cmd/core.py

@@ -7,8 +7,8 @@
 import sys
 from typing import Callable, Optional, Union
 
-from . import exc
-from .types import StrOrBytesPath
+from .. import exc
+from ..types import StrOrBytesPath
 
 logger = logging.getLogger(__name__)
 

libvcs/conftest.py

@@ -10,8 +10,8 @@
 
 from faker import Faker
 
+from libvcs.cmd.core import run, which
 from libvcs.states.git import GitRemoteDict, GitRepo
-from libvcs.util import run, which
 
 skip_if_git_missing = pytest.mark.skipif(
     not which("git"), reason="git is not available"

libvcs/states/base.py

@@ -4,8 +4,8 @@
 from typing import NamedTuple
 from urllib import parse as urlparse
 
+from libvcs.cmd.core import CmdLoggingAdapter, mkdir_p, run
 from libvcs.types import StrOrPath
-from libvcs.util import CmdLoggingAdapter, mkdir_p, run
 
 logger = logging.getLogger(__name__)
 

tests/cmd/test_core.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from libvcs.util import mkdir_p, which
+from libvcs.cmd.core import mkdir_p, which
 
 
 def test_mkdir_p(tmp_path: pathlib.Path):

tests/states/test_conftest.py

@@ -2,8 +2,8 @@
 
 import pytest
 
+from libvcs.cmd.core import which
 from libvcs.conftest import CreateRepoCallbackFixtureProtocol
-from libvcs.util import which
 
 
 @pytest.mark.skipif(not which("git"), reason="git is not available")

tests/states/test_git.py

@@ -10,6 +10,7 @@
 from pytest_mock import MockerFixture
 
 from libvcs import exc
+from libvcs.cmd.core import run, which
 from libvcs.conftest import CreateRepoCallbackFixtureProtocol
 from libvcs.shortcuts import create_repo_from_pip_url
 from libvcs.states.git import (
@@ -19,7 +20,6 @@
     convert_pip_url as git_convert_pip_url,
     extract_status,
 )
-from libvcs.util import run, which
 
 if not which("git"):
     pytestmark = pytest.mark.skip(reason="git is not available")

tests/states/test_hg.py

@@ -3,8 +3,8 @@
 
 import pytest
 
+from libvcs.cmd.core import run, which
 from libvcs.shortcuts import create_repo, create_repo_from_pip_url
-from libvcs.util import run, which
 
 if not which("hg"):
     pytestmark = pytest.mark.skip(reason="hg is not available")

tests/states/test_svn.py

@@ -4,10 +4,10 @@
 
 import pytest
 
+from libvcs.cmd.core import which
 from libvcs.conftest import CreateRepoCallbackFixtureProtocol
 from libvcs.shortcuts import create_repo_from_pip_url
 from libvcs.states.svn import SubversionRepo
-from libvcs.util import which
 
 if not which("svn"):
     pytestmark = pytest.mark.skip(reason="svn is not available")