skilleter-thingy 0.0.70__tar.gz → 0.0.72__tar.gz

{skilleter_thingy-0.0.70/skilleter_thingy.egg-info → skilleter_thingy-0.0.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.70
+Version: 0.0.72
 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
@@ -18,7 +18,6 @@ Requires-Dist: pyaml
 Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
-Requires-Dist: tomlkit
 
 # Thingy
 

{skilleter_thingy-0.0.70 → skilleter_thingy-0.0.72}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.70"
+version = "0.0.72"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -34,7 +34,7 @@ dependencies = [
     "pygit2",
     "python-dateutil",
     "requests",
-    "tomlkit",
+#    "tomlkit",
 ]
 
 [project.urls]
@@ -67,6 +67,7 @@ gphotosync      =  "skilleter_thingy:gphotosync.gphotosync"
 linecount       =  "skilleter_thingy:linecount.linecount"
 mg              =  "skilleter_thingy:mg.mg"
 moviemover      =  "skilleter_thingy:moviemover.moviemover"
+multigit        =  "skilleter_thingy:multigit.multigit"
 photodupe       =  "skilleter_thingy:photodupe.photodupe"
 phototidier     =  "skilleter_thingy:phototidier.phototidier"
 py-audit        =  "skilleter_thingy:py_audit.py_audit"

{skilleter_thingy-0.0.70 → skilleter_thingy-0.0.72}/skilleter_thingy/multigit.py

@@ -5,8 +5,11 @@
 import os
 import sys
 import argparse
+import fnmatch
+import configparser
 
-import tomlkit
+# TODO: Switch to tomlkit 
+from collections import defaultdict
 
 import thingy.git2 as git
 import thingy.colour as colour
@@ -17,28 +20,23 @@ import thingy.colour as colour
 
     [default]
     # Default settings
-    default branch = name
 
-    [repos]
+    [repo_path]
     name = path
     default branch = name
-
-    [git-repo-location] # Either absolute or relative to the directory where the configuration file is found
-    # Repo-specific settings to override default section
 """
 
-# TODO: -j option to run in parallel
+# TODO: -j option to run in parallel?
 # TODO: init function
 # TODO: Use the configuration file
 # TODO: Don't use a fixed list of default branch names
-# TODO: Output name of each git repo as it is processed as command sits there seeming to do nothing otherwise.
+# TODO: / Output name of each git repo as it is processed as command sits there seeming to do nothing otherwise.
+# TODO: ? Pull/fetch - only output after running command and only if something updated
 
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
 
-DEFAULT_BRANCHES = ('main', 'scv-poc', 'master')
-
 ################################################################################
 
 def error(msg, status=1):
@@ -63,58 +61,112 @@ def show_progress(width, msg):
 
 ################################################################################
 
-def find_git_repos(directory):
+def find_git_repos(directory, wildcard):
     """Locate and return a list of '.git' directory parent directories in the
-       specified path"""
-
-    git_repos = []
+       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."""
 
     for root, dirs, _ in os.walk(directory):
         if '.git' in dirs:
-            git_repos.append(root)
-
-    return git_repos
+            if root.startswith('./'):
+                root = root[2:]
+
+            if wildcard:
+                for card in wildcard:
+                    if fnmatch.fnmatch(root, card):
+                        yield root
+                        break
+            else:
+                yield root
 
 ################################################################################
 
 def mg_init(args, config, console):
-    """Create or update the configuration"""
-
-    error('Not used - yet!')
-
-    if config:
-        print(f'Updating existing multigit configuration file - {args.config}')
-        error('Not supported yet')
-    else:
-        print(f'Creating new multigit configuration file - {args.config}')
+    """Create or update the configuration
+       By default, it scans the tree for git directories and adds or updates them
+       in the configuration, using the current branch as the default branch. """
 
     # Search for .git directories
 
-    git_repos = find_git_repos(args.directory)
+    for repo in find_git_repos(args.directory, args.repos):
+        if not args.quiet:
+            show_progress(console.columns, repo)
+
+        config[repo] = {'default branch': git.branch(path=repo)}
 
 ################################################################################
 
 def mg_status(args, config, console):
     """Report Git status for any repo that has a non-empty status"""
 
-    for repo in find_git_repos(args.directory):
+    for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
             show_progress(console.columns, repo)
 
         status = git.status(path=repo)
         branch = git.branch(path=repo)
 
-        if status or branch not in DEFAULT_BRANCHES:
-            if branch in DEFAULT_BRANCHES:
+        if status or branch != config[repo]['default branch']:
+            if branch == config[repo]['default branch']:
                 colour.write(f'[BOLD:{repo}]')
             else:
                 colour.write(f'[BOLD:{repo}] - branch: [BLUE:{branch}]')
 
+            staged = defaultdict(list)
+            unstaged = defaultdict(list)
+            untracked = []
+
             for entry in status:
                 if entry[0] == '??':
-                    colour.write(f'    Untracked: [BLUE:{entry[1]}]')
+                    untracked.append(entry[1])
+                elif entry[0][0] == 'M':
+                    staged['Updated'].append(entry[1])
+                elif entry[0][0] == 'T':
+                    staged['Type changed'].append(entry[1])
+                elif entry[0][0] == 'A':
+                    staged['Added'].append(entry[1])
+                elif entry[0][0] == 'D':
+                    staged['Deleted'].append(entry[1])
+                elif entry[0][0] == 'R':
+                    staged['Renamed'].append(entry[1])
+                elif entry[0][0] == 'C':
+                    staged['Copied'].append(entry[1])
+                elif entry[0][1] == 'M':
+                    colour.write(f'    WT Updated:      [BLUE:{entry[1]}]')
+                elif entry[0][1] == 'T':
+                    colour.write(f'    WT Type changed: [BLUE:{entry[1]}]')
+                elif entry[0][1] == 'D':
+                    unstaged['Deleted'].append(entry[1])
+                elif entry[0][1] == 'R':
+                    colour.write(f'    WT Renamed:      [BLUE:{entry[1]}]')
+                elif entry[0][1] == 'C':
+                    colour.write(f'    WT Copied:       [BLUE:{entry[1]}]')
                 else:
-                    colour.write(f'    [BLUE:{entry}]')
+                    staged['Other'].append(f'    {entry[0]}:    [BLUE:{entry[1]}]')
+
+            if untracked:
+                colour.write()
+                colour.write('Untracked files:')
+
+                for git_object in untracked:
+                    colour.write(f'    [BLUE:{git_object}]')
+
+            if staged:
+                colour.write()
+                colour.write('Changes staged for commit:')
+
+                for item in staged:
+                    for git_object in staged[item]:
+                        colour.write(f'    {item}: [BLUE:{git_object}]')
+
+            if unstaged:
+                colour.write()
+                colour.write('Changes not staged for commit:')
+
+                for item in unstaged:
+                    for git_object in unstaged[item]:
+                        colour.write(f'    {item}: [BLUE:{git_object}]')
 
             colour.write()
 
@@ -123,10 +175,12 @@ def mg_status(args, config, console):
 def mg_fetch(args, config, console):
     """Run git fetch everywhere"""
 
-    for repo in find_git_repos(args.directory):
+    for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
             show_progress(console.columns, repo)
 
+        colour.write(f'Fetching updates for [BLUE:{repo}]')
+
         result = git.fetch(path=repo)
 
         if result:
@@ -144,10 +198,12 @@ def mg_fetch(args, config, console):
 def mg_pull(args, config, console):
     """Run git pull everywhere"""
 
-    for repo in find_git_repos(args.directory):
+    for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
             show_progress(console.columns, repo)
 
+        colour.write(f'Pulling updates for [BLUE:{repo}]')
+
         try:
             result = git.pull(path=repo)
         except git.GitError as exc:
@@ -173,7 +229,26 @@ def mg_push(args, config, console):
     # TODO: Add option for force-push?
     # TODO: Add option for manual confirmation?
 
-    pass
+################################################################################
+
+def mg_checkout(args, config, console):
+    """Run git checkout everywhere.
+       By default it just checks out the specified branch (or the default branch)
+       if the branch exists in the repo.
+       If the 'create' option is specified then branch is created"""
+
+    # TODO: Add --create handling
+
+    for repo in find_git_repos(args.directory, args.repos):
+        if not args.quiet:
+            show_progress(console.columns, repo)
+
+        branch = args.branch or config[repo]['default branch']
+
+        if git.branch(path=repo) != branch:
+            console.write(f'Checking out [BLUE:{branch}] in [BLUE:{repo}]')
+
+            git.checkout(branch, path=repo)
 
 ################################################################################
 
@@ -186,6 +261,7 @@ def main():
        'fetch': mg_fetch,
        'pull': mg_pull,
        'push': mg_push,
+       'checkout':  mg_checkout,
     }
 
     # Parse args in the form COMMAND OPTIONS SUBCOMMAND SUBCOMMAND_OPTIONS PARAMETERS
@@ -198,25 +274,40 @@ 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)')
 
     subparsers = parser.add_subparsers(dest='command')
 
     # Subcommands - currently just init, status, fetch, pull, push, with more to come
 
-    parser_init = subparsers.add_parser('init', help='')
+    parser_init = subparsers.add_parser('init', help='Build or update the configuration file using the current branch in each repo as the default branch')
 
-    parser_status = subparsers.add_parser('status', help='Report git status in every repo that has one')
+    parser_status = subparsers.add_parser('status', help='Report git status in every repo that has something to report')
     parser_fetch = subparsers.add_parser('fetch', help='Run git fetch in every repo')
     parser_pull = subparsers.add_parser('pull', help='Run git pull in every repo')
     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('branch', nargs='?', default=None, action='store', help='The branch name to check out (defaults to the default branch)')
+
     # Parse the command line
 
     args = parser.parse_args()
 
+    # Basic error checking
+
+    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 = tomlkit.loads(args.config) if os.path.isfile(args.config) else None
+    config = configparser.ConfigParser()
+
+    if os.path.isfile(args.config):
+        config.read(args.config)
 
     # Get the console size
 
@@ -226,9 +317,15 @@ def main():
 
     commands[args.command](args, config, console)
 
+    # Save the updated configuration file
+
+    if config:
+        with open(args.config, 'w') as configfile:
+            config.write(configfile)
+
 ################################################################################
 
-def mg():
+def multigit():
     """Entry point"""
 
     try:
@@ -241,4 +338,4 @@ def mg():
 ################################################################################
 
 if __name__ == '__main__':
-    mg()
+    multigit()

{skilleter_thingy-0.0.70 → skilleter_thingy-0.0.72}/skilleter_thingy/thingy/git2.py

@@ -203,7 +203,7 @@ def pull(repo=None, all=False, path=None):
 
 ################################################################################
 
-def checkout(branch, create=False):
+def checkout(branch, create=False, path=None):
     """ Checkout a branch (optionally creating it) """
 
     cmd = ['checkout']
@@ -213,7 +213,7 @@ def checkout(branch, create=False):
 
     cmd.append(branch)
 
-    return git(cmd)
+    return git(cmd, path=path)
 
 ################################################################################
 

{skilleter_thingy-0.0.70 → skilleter_thingy-0.0.72/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.70
+Version: 0.0.72
 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
@@ -18,7 +18,6 @@ Requires-Dist: pyaml
 Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
-Requires-Dist: tomlkit
 
 # Thingy
 

{skilleter_thingy-0.0.70 → skilleter_thingy-0.0.72}/skilleter_thingy.egg-info/entry_points.txt

@@ -25,6 +25,7 @@ gphotosync = skilleter_thingy:gphotosync.gphotosync
 linecount = skilleter_thingy:linecount.linecount
 mg = skilleter_thingy:mg.mg
 moviemover = skilleter_thingy:moviemover.moviemover
+multigit = skilleter_thingy:multigit.multigit
 photodupe = skilleter_thingy:photodupe.photodupe
 phototidier = skilleter_thingy:phototidier.phototidier
 py-audit = skilleter_thingy:py_audit.py_audit

{skilleter_thingy-0.0.70 → skilleter_thingy-0.0.72}/skilleter_thingy.egg-info/requires.txt

@@ -6,4 +6,3 @@ pyaml
 pygit2
 python-dateutil
 requests
-tomlkit