diff --git a/src/mepo/command/branch_create.py b/src/mepo/command/branch_create.py index 29b8ce3b..bc750cf4 100644 --- a/src/mepo/command/branch_create.py +++ b/src/mepo/command/branch_create.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/branch_delete.py b/src/mepo/command/branch_delete.py index b2181ddf..f6b7a22a 100644 --- a/src/mepo/command/branch_delete.py +++ b/src/mepo/command/branch_delete.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/branch_list.py b/src/mepo/command/branch_list.py index f4ddad5b..4381a624 100644 --- a/src/mepo/command/branch_list.py +++ b/src/mepo/command/branch_list.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/changed-files.py b/src/mepo/command/changed-files.py index 42963d99..7ce2a761 100644 --- a/src/mepo/command/changed-files.py +++ b/src/mepo/command/changed-files.py @@ -8,7 +8,7 @@ from ..utilities import verify from ..utilities.version import version_to_string from ..utilities.version import sanitize_version_string -from ..repository.git import GitRepository +from ..git import GitRepository VER_LEN = 30 diff --git a/src/mepo/command/checkout-if-exists.py b/src/mepo/command/checkout-if-exists.py index 92c53970..77b10f93 100644 --- a/src/mepo/command/checkout-if-exists.py +++ b/src/mepo/command/checkout-if-exists.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities import colors def run(args): diff --git a/src/mepo/command/checkout.py b/src/mepo/command/checkout.py index ff6aa322..c8711bb8 100644 --- a/src/mepo/command/checkout.py +++ b/src/mepo/command/checkout.py @@ -1,7 +1,7 @@ from ..state.state import MepoState from ..utilities import verify from ..utilities import colors -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/clone.py b/src/mepo/command/clone.py index 3bee0146..ab051b3c 100644 --- a/src/mepo/command/clone.py +++ b/src/mepo/command/clone.py @@ -7,7 +7,7 @@ from ..state.state import MepoState from ..state.state import StateDoesNotExistError from ..state.component import MepoComponent -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities import shellcmd from ..utilities import colors from ..utilities import mepoconfig diff --git a/src/mepo/command/commit.py b/src/mepo/command/commit.py index 3a188dac..70a8d638 100644 --- a/src/mepo/command/commit.py +++ b/src/mepo/command/commit.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository from .stage import stage_files diff --git a/src/mepo/command/compare.py b/src/mepo/command/compare.py index 47343125..fd8f563e 100644 --- a/src/mepo/command/compare.py +++ b/src/mepo/command/compare.py @@ -6,7 +6,7 @@ from ..utilities.version import version_to_string from ..utilities.version import sanitize_version_string -from ..repository.git import GitRepository +from ..git import GitRepository VER_LEN = 30 diff --git a/src/mepo/command/develop.py b/src/mepo/command/develop.py index ba442fad..1e32b97a 100644 --- a/src/mepo/command/develop.py +++ b/src/mepo/command/develop.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities import colors def run(args): diff --git a/src/mepo/command/diff.py b/src/mepo/command/diff.py index 899c8ba8..9e476580 100644 --- a/src/mepo/command/diff.py +++ b/src/mepo/command/diff.py @@ -6,7 +6,7 @@ from shutil import get_terminal_size from ..state.state import MepoState -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities import verify def run(args): diff --git a/src/mepo/command/fetch.py b/src/mepo/command/fetch.py index cc4f260b..66efdec9 100644 --- a/src/mepo/command/fetch.py +++ b/src/mepo/command/fetch.py @@ -1,7 +1,7 @@ from ..state.state import MepoState from ..utilities import colors from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/pull-all.py b/src/mepo/command/pull-all.py index 1f52bdf5..dbacd1e1 100644 --- a/src/mepo/command/pull-all.py +++ b/src/mepo/command/pull-all.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..state.component import MepoVersion -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities import colors def run(args): diff --git a/src/mepo/command/pull.py b/src/mepo/command/pull.py index a72041cd..e081cf58 100644 --- a/src/mepo/command/pull.py +++ b/src/mepo/command/pull.py @@ -2,7 +2,7 @@ from ..state.component import MepoVersion from ..utilities import verify from ..utilities import colors -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/push.py b/src/mepo/command/push.py index f70ff4bc..85bf3f53 100644 --- a/src/mepo/command/push.py +++ b/src/mepo/command/push.py @@ -1,6 +1,6 @@ from ..utilities import verify from ..state.state import MepoState -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/restore-state.py b/src/mepo/command/restore-state.py index 283704ff..106846a2 100644 --- a/src/mepo/command/restore-state.py +++ b/src/mepo/command/restore-state.py @@ -4,7 +4,7 @@ import atexit from ..state.state import MepoState -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities.version import version_to_string from ..utilities import colors diff --git a/src/mepo/command/save.py b/src/mepo/command/save.py index d343ac4f..2fe02497 100644 --- a/src/mepo/command/save.py +++ b/src/mepo/command/save.py @@ -2,7 +2,7 @@ from ..state.state import MepoState from ..state.component import MepoVersion -from ..repository.git import GitRepository +from ..git import GitRepository from ..registry import Registry from ..utilities.version import sanitize_version_string diff --git a/src/mepo/command/stage.py b/src/mepo/command/stage.py index 3fca9618..117b1ee9 100644 --- a/src/mepo/command/stage.py +++ b/src/mepo/command/stage.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository from ..state.component import MepoVersion def run(args): diff --git a/src/mepo/command/stash_apply.py b/src/mepo/command/stash_apply.py index e0985fc7..9f012c73 100644 --- a/src/mepo/command/stash_apply.py +++ b/src/mepo/command/stash_apply.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/stash_list.py b/src/mepo/command/stash_list.py index ef7b7520..3d736504 100644 --- a/src/mepo/command/stash_list.py +++ b/src/mepo/command/stash_list.py @@ -1,5 +1,5 @@ from ..state.state import MepoState -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/stash_pop.py b/src/mepo/command/stash_pop.py index 6007aa79..4df97702 100644 --- a/src/mepo/command/stash_pop.py +++ b/src/mepo/command/stash_pop.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/stash_push.py b/src/mepo/command/stash_push.py index 63a00ade..e04e2bb4 100644 --- a/src/mepo/command/stash_push.py +++ b/src/mepo/command/stash_push.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/stash_show.py b/src/mepo/command/stash_show.py index 9181063d..648529e5 100644 --- a/src/mepo/command/stash_show.py +++ b/src/mepo/command/stash_show.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/status.py b/src/mepo/command/status.py index 4e2dd4f1..55d413e3 100644 --- a/src/mepo/command/status.py +++ b/src/mepo/command/status.py @@ -8,7 +8,7 @@ from ..state.state import MepoState -from ..repository.git import GitRepository +from ..git import GitRepository from ..utilities.version import version_to_string from ..utilities.version import sanitize_version_string diff --git a/src/mepo/command/tag_create.py b/src/mepo/command/tag_create.py index 3044d2f9..8b9d56c0 100644 --- a/src/mepo/command/tag_create.py +++ b/src/mepo/command/tag_create.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository # Popping up an EDITOR is based on https://stackoverflow.com/a/39989442 import os, tempfile, subprocess diff --git a/src/mepo/command/tag_delete.py b/src/mepo/command/tag_delete.py index 76d2c63b..3e68e4ed 100644 --- a/src/mepo/command/tag_delete.py +++ b/src/mepo/command/tag_delete.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/tag_list.py b/src/mepo/command/tag_list.py index faad4718..ad76b542 100644 --- a/src/mepo/command/tag_list.py +++ b/src/mepo/command/tag_list.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/tag_push.py b/src/mepo/command/tag_push.py index 3e6186e8..d83b63c2 100644 --- a/src/mepo/command/tag_push.py +++ b/src/mepo/command/tag_push.py @@ -1,6 +1,6 @@ from ..state.state import MepoState from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/command/unstage.py b/src/mepo/command/unstage.py index 291e4146..e198919c 100644 --- a/src/mepo/command/unstage.py +++ b/src/mepo/command/unstage.py @@ -1,7 +1,7 @@ from ..state.state import MepoState from ..utilities import shellcmd from ..utilities import verify -from ..repository.git import GitRepository +from ..git import GitRepository def run(args): allcomps = MepoState.read_state() diff --git a/src/mepo/repository/git.py b/src/mepo/git.py similarity index 99% rename from src/mepo/repository/git.py rename to src/mepo/git.py index adddbac2..bca75603 100644 --- a/src/mepo/repository/git.py +++ b/src/mepo/git.py @@ -5,10 +5,10 @@ from urllib.parse import urljoin -from ..utilities import shellcmd -from ..utilities import colors +from .utilities import shellcmd +from .utilities import colors -from ..utilities.exceptions import RepoAlreadyClonedError +from .utilities.exceptions import RepoAlreadyClonedError class GitRepository(object): """