skilleter-thingy 0.1.27__tar.gz → 0.1.29__tar.gz

{skilleter_thingy-0.1.27 → skilleter_thingy-0.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.27
+Version: 0.1.29
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.1.27 → skilleter_thingy-0.1.29}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.1.27"
+version = "0.1.29"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.1.27 → skilleter_thingy-0.1.29}/skilleter_thingy/multigit.py

@@ -317,6 +317,8 @@ def add_new_repo(args, config, repo):
 
     abs_repo_path = absolute_repo_path(args, repo)
 
+    added = repo not in config
+
     config[repo] = {}
 
     default_branch = git.branch(path=abs_repo_path)
@@ -335,7 +337,10 @@ def add_new_repo(args, config, repo):
         config[repo]['repo name'] = os.path.basename(repo)
 
     if not args.quiet:
-        colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
+        if added:
+            colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
+        else:
+            colour.write(f'Reset [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
 
 ################################################################################
 
@@ -472,9 +477,21 @@ def mg_add(args, config, console):
     location = args.parameters[1]
 
     if os.path.exists(location):
-        colour.error(f'"[BLUE:{location}]" already exists', prefix=True)
+        if os.path.isdir(os.path.join(location, '.git')):
+            remotes = git.remotes(path=location)
+
+            for remote in remotes:
+                if repo.endswith('.git') and repo == remotes[remote]:
+                    break
+                elif f'{repo}.git' == remotes[remote]:
+                    break
+            else:
+                colour.error(f'"[BLUE:{location}]" already exists and was not cloned from [BLUE:{repo}]', prefix=True)
+        else:
+            colour.error(f'"[BLUE:{location}]" already exists and is not a Git working tree')
 
-    git.clone(repo, path=location)
+    else:
+        git.clone(repo, path=location)
 
     # Add to the configuration
 
@@ -658,8 +675,7 @@ def run_git_command(args, config, console):
         for cmd in args.parameters:
             repo_command.append(branch_name(cmd, repo['default branch']))
 
-        if not args.quiet:
-            colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
+        colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
 
         # Run the command in the working tree
 

{skilleter_thingy-0.1.27 → skilleter_thingy-0.1.29}/skilleter_thingy/thingy/colour.py

@@ -198,6 +198,17 @@ def error(txt, newline=True, stream=sys.stderr, status=1, prefix=False):
 
 ################################################################################
 
+def warning(txt, newline=True, stream=sys.stderr, prefix=False):
+    """ Write a warning message to the specified stream (defaulting to
+        stderr). Prefix the output with 'WARNING:' in red if prefix==True """
+
+    if prefix:
+        write('[RED:WARNING]: ', newline=False, stream=stream, )
+
+    write(txt, newline, stream)
+
+################################################################################
+
 if __name__ == '__main__':
     write('Foreground: [RED]red [GREEN]green [BLACK]black [NORMAL]normal')
     write('Background: [BRED]red [BGREEN]green [BBLACK]black [NORMAL]normal')

{skilleter_thingy-0.1.27 → skilleter_thingy-0.1.29}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.27
+Version: 0.1.29
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk