skilleter-thingy 0.1.27__py3-none-any.whl → 0.1.29__py3-none-any.whl

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/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.dist-info → skilleter_thingy-0.1.29.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.1.29.dist-info}/RECORD

@@ -25,7 +25,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
 skilleter_thingy/localphotosync.py,sha256=WF0TcCvLfl7cVOLzYYQK_t2WebLfQ-5FM6UB3r7Fpvw,5952
 skilleter_thingy/moviemover.py,sha256=QzUAWQzQ1AWWREIhl-VMaLo2h8MMhOekBnao5jGWV1s,4470
-skilleter_thingy/multigit.py,sha256=B2h9CyfGhpI_D6BB4t8tEBrodPZb9g4evXzvWZEXLoI,34543
+skilleter_thingy/multigit.py,sha256=rnQ0YGkEy6H54PRt8nCt-G02LGy-wiKRJVk8ovR_pTw,35179
 skilleter_thingy/photodupe.py,sha256=2hw4EhDKH37_BgdXKkPm9GrftfIORmubQi38Yn0b4Mg,4084
 skilleter_thingy/phototidier.py,sha256=BOu-cKHMivDlBqlRqv7sL3J6Ix1K2dxWWNcderldyZo,7818
 skilleter_thingy/py_audit.py,sha256=4CAdqBAIIVcpTCn_7dGm56bdfGpUtUJofqTGZomClkY,4417
@@ -44,7 +44,7 @@ skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63s
 skilleter_thingy/xchmod.py,sha256=T89xiH_po0nvH5T1AGgQOD5yhjKd9-LcHcmez3IORww,4604
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
-skilleter_thingy/thingy/colour.py,sha256=1rDxU8NwCQQUUx5cOb-9ndp_XO39uQUlZJLrFO6lGPg,7567
+skilleter_thingy/thingy/colour.py,sha256=mxHDpbUYad6xDsOKWco7CL0Nk3J5VKV_IZ3T5VjXwOI,7978
 skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
 skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,1783
@@ -61,9 +61,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
 skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.1.27.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.27.dist-info/METADATA,sha256=DFX-RjiKM7rowsAJ5grR7ZYO3yZpOg2ZoX1sdTt1Ls4,30430
-skilleter_thingy-0.1.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.1.27.dist-info/entry_points.txt,sha256=mklrWFvNKw9Hyem9RG3x0PoVYjlx2fDnJ3xWMTMOmfs,2258
-skilleter_thingy-0.1.27.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.27.dist-info/RECORD,,
+skilleter_thingy-0.1.29.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.29.dist-info/METADATA,sha256=DlnH54zxSd8HRZ1-BUOYZxXZziID__gkX8_N0oeDLkw,30430
+skilleter_thingy-0.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.1.29.dist-info/entry_points.txt,sha256=mklrWFvNKw9Hyem9RG3x0PoVYjlx2fDnJ3xWMTMOmfs,2258
+skilleter_thingy-0.1.29.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.29.dist-info/RECORD,,