Renamed repository/git.py -> git.py, and associated changes

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()

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()

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()

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
 

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):

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()

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

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
 

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
 

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):

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):

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()

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):

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()

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()

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
 

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
 

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):

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()

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()

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()

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()

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()

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

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

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()

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()

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()

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()

src/mepo/repository/git.py → 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):
     """