skilleter-thingy 0.2.14__py3-none-any.whl → 0.2.15__py3-none-any.whl

skilleter_thingy/thingy/git.py

@@ -948,7 +948,7 @@ def ref(fields=('objectname'), sort=None, remotes=False, path=None):
 
 ################################################################################
 
-def branches(all=False, path=None):
+def branches(all=False, path=None, remote=False):
     """ Return a list of all the branches in the current repo """
 
     cmd = ['branch', '--format=%(refname:short)','--list']
@@ -956,6 +956,9 @@ def branches(all=False, path=None):
     if all:
         cmd.append('--all')
 
+    if remote:
+        cmd.append('--remote')
+
     results = []
     for output in git(cmd, path=path):
         if ' -> ' not in output and '(HEAD detached at ' not in output:
@@ -1250,7 +1253,10 @@ def matching_branch(branchname, case=False, path=None):
         otherwise, it just checks for a branches containing the branchname
         as a substring. """
 
-    all_branches = branches(all=True, path=path)
+    local_branches = branches(path=path)
+    remote_branches = branches(path=path, remote=True)
+
+    all_branches = local_branches + remote_branches
 
     # Always return exact matches
 
@@ -1284,8 +1290,8 @@ def matching_branch(branchname, case=False, path=None):
                 # If the match is a remote branch, ignore it if we already have the equivalent
                 # local branch, otherwise add the name of the local branch that would be created.
 
-                if branch.startswith('remotes/'):
-                    localbranch = '/'.join(branch.split('/')[2:])
+                if branch in remote_branches:
+                    localbranch = '/'.join(branch.split('/')[1:])
                     if localbranch not in matching:
                         matching_remote.append(localbranch)
                 else:

{skilleter_thingy-0.2.14.dist-info → skilleter_thingy-0.2.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.14
+Version: 0.2.15
 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.2.14.dist-info → skilleter_thingy-0.2.15.dist-info}/RECORD

@@ -43,7 +43,7 @@ skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUs
 skilleter_thingy/thingy/dircolors.py,sha256=aBcq9ci855GSOIjrZWm8kG0ksCodvUmc4FlIOEOyBcA,12292
 skilleter_thingy/thingy/docker.py,sha256=iT8PqX2hJfcR1e4hotQfSBBYNe0Qdcmeo-XJ6y7lw7Y,2477
 skilleter_thingy/thingy/files.py,sha256=nFIOEi2rl2SuYa6Zd7Nf1BWCKyKlF8D6hsbPlfnVefQ,4791
-skilleter_thingy/thingy/git.py,sha256=xUIjRH3BLXssUbGdnxr7-UfGuiSai17jruNe7h9gBJw,43070
+skilleter_thingy/thingy/git.py,sha256=aa4vFwXiZ9JkH-zJuKZWACw4Ympcomi6EsPdlLIJiSs,43227
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=TY9rpj4q8uZxerSt641LGUTy0TZgUjgfEX-CkRMuyek,2540
@@ -51,9 +51,9 @@ skilleter_thingy/thingy/run.py,sha256=Q6uug_LucKbn36RB-r08QYaCzmeoU452ipzQ2YiVUP
 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=ZfUvi8qFNGrk7J030Zy57xjwMtfIArJyqa-MqafyjVk,1016
-skilleter_thingy-0.2.14.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.14.dist-info/METADATA,sha256=bA0ajwEyvjYdGEvO7KlRLoeZAfdRhudqkepZiTMHASk,28914
-skilleter_thingy-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.14.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.14.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.14.dist-info/RECORD,,
+skilleter_thingy-0.2.15.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.2.15.dist-info/METADATA,sha256=NV9puo96TLDp25-yZ2LNqq95Q3eAAIcNX0rhciQJh58,28914
+skilleter_thingy-0.2.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.2.15.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
+skilleter_thingy-0.2.15.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.2.15.dist-info/RECORD,,