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

tony · tony · commit fc118b4b8af6 · 2022-04-04T04:44:01.000-05:00
diff --git a/docs/states/index.md b/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:
 ```
diff --git a/libvcs/__init__.py b/libvcs/__init__.py
@@ -1,11 +1,11 @@
 """Repo package for libvcs."""
 import logging
 
+from .cmd.core import RepoLoggingAdapter
 from .states.base import BaseRepo
 from .states.git import GitRepo
 from .states.hg import MercurialRepo
 from .states.svn import SubversionRepo
-from .util import RepoLoggingAdapter
 
 __all__ = [
     "GitRepo",
diff --git a/libvcs/cmd/core.py b/libvcs/cmd/core.py
@@ -6,7 +6,7 @@
 import subprocess
 import sys
 
-from . import exc
+from .. import exc
 
 logger = logging.getLogger(__name__)
 
diff --git a/libvcs/states/base.py b/libvcs/states/base.py
@@ -4,7 +4,7 @@
 from typing import NamedTuple
 from urllib import parse as urlparse
 
-from ..util import RepoLoggingAdapter, mkdir_p, run
+from libvcs.cmd.core import RepoLoggingAdapter, mkdir_p, run
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5,8 +5,8 @@
 
 import pytest
 
+from libvcs.cmd.core import run
 from libvcs.shortcuts import create_repo_from_pip_url
-from libvcs.util import run
 
 
 @pytest.fixture(autouse=True, scope="session")
diff --git a/tests/states/test_git.py b/tests/states/test_git.py
@@ -11,6 +11,7 @@
 from pytest_mock import MockerFixture
 
 from libvcs import exc
+from libvcs.cmd.core import run, which
 from libvcs.shortcuts import create_repo_from_pip_url
 from libvcs.states.git import (
     FullRemoteDict,
@@ -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")
diff --git a/tests/states/test_hg.py b/tests/states/test_hg.py
@@ -5,8 +5,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")
diff --git a/tests/states/test_svn.py b/tests/states/test_svn.py
@@ -4,8 +4,8 @@
 
 import pytest
 
+from libvcs.cmd.core import run, which
 from libvcs.shortcuts import create_repo_from_pip_url
-from libvcs.util import run, which
 
 if not which("svn"):
     pytestmark = pytest.mark.skip(reason="svn is not available")
diff --git a/tests/test_util.py b/tests/test_util.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):
