skilleter-thingy 0.0.75__py3-none-any.whl → 0.0.76__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -25,6 +25,7 @@ import thingy.colour as colour
     default branch = name
 """
 
+# TODO: [ ] If the config file isn't in the current directory then search up the directory tree for it but run in the current directory
 # TODO: [ ] -j option to run in parallel?
 # TODO: [ ] init function
 # TODO: [/] Use the configuration file
@@ -37,6 +38,7 @@ import thingy.colour as colour
 # TODO: [ ] Better error-handling - e.g. continue/abort option after failure in one repo
 # TODO: [ ] Dry-run option
 # TODO: [ ] Verbose option
+# TODO: [ ] When specifying list of repos, if repo name doesn't contain '/' prefix it with '*'?
 
 ################################################################################
 
@@ -69,8 +71,13 @@ def show_progress(width, msg):
 def find_git_repos(directory, wildcard):
     """Locate and return a list of '.git' directory parent directories in the
        specified path.
+
        If wildcard is not None then it is treated as a list of wildcards and
-       only repos matching at least one of the wildcards are returned."""
+       only repos matching at least one of the wildcards are returned.
+
+       If the same repo matches multiple times it will only be returned once. """
+
+    repos = set()
 
     for root, dirs, _ in os.walk(directory):
         if '.git' in dirs:
@@ -80,10 +87,14 @@ def find_git_repos(directory, wildcard):
             if wildcard:
                 for card in wildcard:
                     if fnmatch.fnmatch(root, card):
-                        yield root
+                        if root not in repos:
+                            yield root
+                            repos.add(root)
                         break
             else:
-                yield root
+                if root not in repos:
+                    yield root
+                    repos.add(root)
 
 ################################################################################
 
@@ -261,7 +272,10 @@ def mg_checkout(args, config, console):
        if the branch exists in the repo.
        If the 'create' option is specified then branch is created"""
 
-    # TODO: Add --create handling
+    # TODO: [ ] Add --create handling
+    # TODO: [ ] Checkout remote branches
+    # TODO: [ ] only try checkout if branch exists
+    # TODO: [ ] option to fetch before checking out
 
     for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
@@ -270,9 +284,9 @@ def mg_checkout(args, config, console):
         branch = args.branch or config[repo]['default branch']
 
         if git.branch(path=repo) != branch:
-            console.write(f'Checking out [BLUE:{branch}] in [BLUE:{repo}]')
+            colour.write(f'Checking out [BLUE:{branch}] in [BOLD:{repo}]')
 
-            git.checkout(branch, path=repo)
+            git.checkout(branch, create=args.create, path=repo)
 
 ################################################################################
 
@@ -327,6 +341,36 @@ def mg_update(args, config, console):
 
 ################################################################################
 
+def mg_clean(args, config, console):
+    """Clean the repos"""
+
+    for repo in find_git_repos(args.directory, args.repos):
+        if not args.quiet:
+            show_progress(console.columns, repo)
+
+        result = git.clean(recurse=args.recurse, force=args.force, dry_run=args.dry_run,
+                           quiet=args.quiet, exclude=args.exclude, ignore_rules=args.x,
+                           remove_only_ignored=args.X, path=repo)
+
+        first_skip = True
+
+        if result:
+            colour.write(f'[BOLD:{repo}]')
+
+            for item in result:
+                skipping = item.startswith('Skipping repository ')
+
+                if skipping and not args.verbose:
+                    if first_skip:
+                        colour.write(f'    Skipping sub-repositories')
+                        first_skip = False
+                else:
+                    colour.write(f'    {item.strip()}')
+
+            colour.write()
+
+################################################################################
+
 def main():
     """Main function"""
 
@@ -339,6 +383,7 @@ def main():
        'checkout':  mg_checkout,
        'commit': mg_commit,
        'update': mg_update,
+       'clean': mg_clean,
     }
 
     # Parse args in the form COMMAND OPTIONS SUBCOMMAND SUBCOMMAND_OPTIONS PARAMETERS
@@ -351,7 +396,7 @@ def main():
     parser.add_argument('--quiet', '-q', action='store_true', help='Minimal console output')
     parser.add_argument('--config', '-c', action='store', default=DEFAULT_CONFIG_FILE, help=f'The configuration file (defaults to {DEFAULT_CONFIG_FILE})')
     parser.add_argument('--directory', '--dir', action='store', default='.', help='The top-level directory of the multigit tree (defaults to the current directory)')
-    parser.add_argument('--repos', '-r', action='append', default=None, help='The list of repo names to work on (defaults to all repos and can contain shell wildcards)')
+    parser.add_argument('--repos', '-r', action='append', default=None, help='The repo names to work on (defaults to all repos and can contain shell wildcards and can be issued multiple times on the command line)')
 
     subparsers = parser.add_subparsers(dest='command')
 
@@ -365,7 +410,7 @@ def main():
     parser_push = subparsers.add_parser('push', help='Run git push in every repo where the current branch isn\'t the default and the most recent commit was by the current user')
 
     parser_checkout = subparsers.add_parser('checkout', help='Checkout the specified branch')
-    parser_checkout.add_argument('--create', action='store_true', help='Create the specified branch and check it out')
+    parser_checkout.add_argument('--create', '-b', action='store_true', help='Create the specified branch and check it out')
     parser_checkout.add_argument('branch', nargs='?', default=None, action='store', help='The branch name to check out (defaults to the default branch)')
 
     parser_commit = subparsers.add_parser('commit', help='Commit changes')
@@ -373,6 +418,17 @@ def main():
 
     parser_update = subparsers.add_parser('update', help='Pull the default branch and if the current branch isn\'t the default branch, rebase it onto the default branch')
 
+    parser_clean = subparsers.add_parser('clean', help='Remove untracked files from the working tree')
+
+    parser_clean.add_argument('--recurse', '-d', action='store_true', help='Recurse into subdirectories')
+    parser_clean.add_argument('--force', '-f', action='store_true', help='If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f or -i')
+    #parser_clean.add_argument('--interactive', '-i', action='store_true', help='Show what would be done and clean files interactively.')
+    parser_clean.add_argument('--dry-run', '-n', action='store_true', help='Don’t actually remove anything, just show what would be done.')
+    #parser_clean.add_argument('--quiet', '-q', , action='store_true', help='Be quiet, only report errors, but not the files that are successfully removed.')
+    parser_clean.add_argument('--exclude', '-e', action='store', help='Use the given exclude pattern in addition to the standard ignore rules.')
+    parser_clean.add_argument('-x', action='store_true', help='Don’t use the standard ignore rules, but still use the ignore rules given with -e options from the command line.')
+    parser_clean.add_argument('-X', action='store_true', help='Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files.')
+
     # Parse the command line
 
     args = parser.parse_args()
@@ -382,8 +438,6 @@ def main():
     if not args.command:
         error('No command specified')
 
-    # TODO: If the config file isn't in the current directory then search up the directory tree for it but run in the current directory
-
     # If the configuration file exists, read it
 
     config = configparser.ConfigParser()
@@ -418,9 +472,14 @@ def multigit():
         main()
     except KeyboardInterrupt:
         sys.exit(1)
+
     except BrokenPipeError:
         sys.exit(2)
 
+    except git.GitError as exc:
+        print(exc)
+        sys.exit(3)
+
 ################################################################################
 
 if __name__ == '__main__':

skilleter_thingy/thingy/git2.py

@@ -1239,6 +1239,38 @@ def log(branch1, branch2=None):
 
     return git(cmd)
 
+################################################################################
+
+def clean(recurse=False, force=False, dry_run=False, quiet=False,
+          exclude=None, ignore_rules=False, remove_only_ignored=False, path=None):
+
+    """ Run git clean """
+
+    cmd = ['clean']
+
+    if recurse:
+        cmd.append('-d')
+
+    if force:
+        cmd.append('--force')
+
+    if dry_run:
+        cmd.append('--dry-run')
+
+    if quiet:
+        cmd.append('--quiet')
+
+    if exclude:
+        cmd += ['--exclude', exclude]
+
+    if ignore_rules:
+        cmd.append('-x')
+
+    if remove_only_ignored:
+        cmd.append('-X')
+
+    return git(cmd, path=path)
+
 ################################################################################
 # Entry point
 

{skilleter_thingy-0.0.75.dist-info → skilleter_thingy-0.0.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.75
+Version: 0.0.76
 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.0.75.dist-info → skilleter_thingy-0.0.76.dist-info}/RECORD

@@ -25,7 +25,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=Vb2zYTEFp26BYdkG810SRg9afyfDqvq4CLHTk-MFf60,22388
 skilleter_thingy/linecount.py,sha256=5voQtjJjDCVx4zjPwVRy620NpuLiwwFitzxjIsRGtxQ,4310
 skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980k,4470
-skilleter_thingy/multigit.py,sha256=QKn2DLf5Fr6WJr99PEM1YV5mmTlfoX7Qt5SbaXA4S8w,15695
+skilleter_thingy/multigit.py,sha256=TiPpPKO-xB0MUrV1Obv4UEZMi209vrcidFolDdFH8hM,18788
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -52,7 +52,7 @@ skilleter_thingy/thingy/dircolors.py,sha256=5NbXMsGWdABLvvZfB70VPmN6N5HyyihfpgoQ
 skilleter_thingy/thingy/docker.py,sha256=9EFatudoVPfB1UbDEtzdJDB3o6ToHiNHv8-oLsUeqiQ,2449
 skilleter_thingy/thingy/files.py,sha256=oW6E6WWwVFSUPdrZnKMx7P_w_hh3etjoN7RrqvYHCHc,4705
 skilleter_thingy/thingy/git.py,sha256=qXWIduF4jbP5pKFYt_hW9Ex5iL9mSBBrcNKBkULhRTg,38834
-skilleter_thingy/thingy/git2.py,sha256=ylEuwO-URTLxFQI--y5ed0Dg0v88reupCRBQnnkohf0,35971
+skilleter_thingy/thingy/git2.py,sha256=UEXeSyT5PlYGtdUAQDEZC7Sc7JmYdAlP6osa1tVmpO8,36620
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dOeu8,2529
@@ -61,9 +61,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.75.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.75.dist-info/METADATA,sha256=QbQfpZry6Uc_yjViSwKltz6mj4IE8hiT5ED0sBJqBIc,5313
-skilleter_thingy-0.0.75.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.75.dist-info/entry_points.txt,sha256=uW11ofmIbfPP_5B-pxb8YDkHbeZ_xeCoO6358R9wGVI,2146
-skilleter_thingy-0.0.75.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.75.dist-info/RECORD,,
+skilleter_thingy-0.0.76.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.76.dist-info/METADATA,sha256=88wOrTIgIDHyAdQssoVO1z_DCE0rWxNey0c8XnJEjq0,5313
+skilleter_thingy-0.0.76.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skilleter_thingy-0.0.76.dist-info/entry_points.txt,sha256=uW11ofmIbfPP_5B-pxb8YDkHbeZ_xeCoO6358R9wGVI,2146
+skilleter_thingy-0.0.76.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.76.dist-info/RECORD,,