skilleter-thingy 0.0.54__tar.gz → 0.0.55__tar.gz

{skilleter_thingy-0.0.54/skilleter_thingy.egg-info → skilleter_thingy-0.0.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.54
+Version: 0.0.55
 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.54 → skilleter_thingy-0.0.55}/pyproject.toml

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

{skilleter_thingy-0.0.54 → skilleter_thingy-0.0.55}/skilleter_thingy/git_parent.py

@@ -18,10 +18,12 @@ import thingy.colour as colour
 def main():
     """ Main function """
 
+    current_branch = git.branch()
+
     parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
     parser.add_argument('-a', '--all', action='store_true', help='Include feature branches as possible parents')
     parser.add_argument('-v', '--verbose', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
-    parser.add_argument('branch', action='store', nargs='?', type=str, default='HEAD', help='Branch, commit or commit')
+    parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch, help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
 
     args = parser.parse_args()
 
@@ -53,7 +55,7 @@ def main():
             if len(parents) == 1:
                 colour.write(f'Parent branch [BLUE:{parents[0]}] is [BLUE:{distance}] commits away from [BLUE:{args.branch}]')
             else:
-                colour.write(f'Parent branches [BLUE:%s] are [BLUE:{distance}] commits away from [BLUE:{args.branch}[' % (', '.join(parents)))
+                colour.write(f'Parent branches [BLUE:%s] are [BLUE:{distance}] commits away from [BLUE:{args.branch}]' % (', '.join(parents)))
         else:
             print(', '.join(parents))
     else:

{skilleter_thingy-0.0.54 → skilleter_thingy-0.0.55}/skilleter_thingy/git_update.py

@@ -78,16 +78,20 @@ def branch_rebase(args, results, branch):
             colour.error(exc.msg)
             sys.exit(1)
 
-        parents, _ = git.parents()
-
         # Ignore feature branches as potential alternative parents unless told otherwise
         # If they are the only possible parent(s) then we still consider them.
 
-        if not args.all_parents:
-            filtered_parents = [p for p in parents if not p.startswith('feature/')]
+        if args.all_parents:
+            parents, _ = git.parents()
+        else:
+            parents, _ = git.parents(ignore='feature/*' )
+
+            logging.debug('Probable parents of %s: %s', branch, parents)
+
+            if not parents:
+                parents, _ = git.parents()
 
-            if filtered_parents:
-                parents = filtered_parents
+                logging.debug('No non-feature-branch parents found for %s. Feature branch parents could be: %s', branch, parents)
 
         # Cheat - if we have multiple possible parents and one is 'develop', 'main' or 'master'
         # choose it.
@@ -184,10 +188,11 @@ def branch_pull(args, results, branch, fail=True):
                 output = git.pull()
 
                 colour.write(output, indent=4)
+
                 if output[0] == 'Already up-to-date.':
                     results['unchanged'].add(branch)
-                else:
-                    results['pulled'].add(branch)
+
+                results['pulled'].add(branch)
 
             except git.GitError as exc:
                 if exc.msg.startswith('There is no tracking information for the current branch.'):
@@ -345,6 +350,8 @@ def main():
     for entry in ('rebased', 'unchanged', 'pulled', 'failed', 'no-tracking'):
         results[entry] -= results['deleted']
 
+    results['pulled'] -= results['unchanged']
+
     if results['rebased']:
         report_branches('[BOLD:The following branches have been rebased:]', results['rebased'])
 

{skilleter_thingy-0.0.54 → skilleter_thingy-0.0.55/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.54
+Version: 0.0.55
 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