Merge pull request #181 from ogr3/python-cleanup

Python cleanup

gitstatus.py

@@ -1,26 +1,32 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
-"""This module defines a Print function to use with python 2.x or 3.x., so we can use the prompt with older versions of Python too
+"""This module defines a Print function to use with python 2.x or 3.x., so we can use the prompt with older versions of
+Python too
 
 It's interface is that of python 3.0's print. See
 http://docs.python.org/3.0/library/functions.html?highlight=print#print
 
-Shamelessly ripped from http://www.daniweb.com/software-development/python/code/217214/a-print-function-for-different-versions-of-python
+Shamelessly ripped from
+http://www.daniweb.com/software-development/python/code/217214/a-print-function-for-different-versions-of-python
 """
+# change those symbols to whatever you prefer
+symbols = {'ahead of': '↑·', 'behind': '↓·', 'prehash': ':'}
 
-__all__ = ["Print"]
 import sys
+import re
+from subprocess import Popen, PIPE
+
+__all__ = ["Print"]
+
 try:
     Print = eval("print")  # python 3.0 case
 except SyntaxError:
-  try:
     D = dict()
+    try:
         exec ("from __future__ import print_function\np=print", D)
         Print = D["p"]  # 2.6 case
-    del D
     except SyntaxError:
-    del D
         def Print(*args, **kwd):  # 2.4, 2.5, define our own Print function
             fout = kwd.get("file", sys.stdout)
             w = fout.write
@@ -31,58 +37,48 @@ except SyntaxError:
                     w(sep)
                     w(str(a))
             w(kwd.get("end", "\n"))
+    finally:
+        del D
 
-# change those symbols to whatever you prefer
-symbols = {'ahead of': '↑·', 'behind': '↓·', 'prehash':':'}
 
-import sys
-import re
-import shlex
-from subprocess import Popen, PIPE, check_output
-
-
-def get_tagname_or_hash():
-    """return tagname if exists else hash"""
-    cmd = 'git log -1 --format="%h%d"'
-    output = check_output(shlex.split(cmd)).decode('utf-8').strip()
-    hash_, tagname = None, None
-    # get hash
-    m = re.search('\(.*\)$', output)
-    if m:
-        hash_ = output[:m.start()-1]
-    # get tagname
-    m = re.search('tag: .*[,\)]', output)
-    if m:
-        tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
-
-    if tagname:
-        return tagname
-    elif hash_:
-        return hash_
-    return None
+def get_tag_or_hash():
+    cmd = Popen(['git', 'describe', '--exact-match'], stdout=PIPE, stderr=PIPE)
+    so, se = cmd.communicate()
+    tag = '%s' % so.decode('utf-8').strip()
+
+    if tag:
+        return tag
+    else:
+        cmd = Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=PIPE, stderr=PIPE)
+        so, se = cmd.communicate()
+        hash_name = '%s' % so.decode('utf-8').strip()
+        return ''.join([symbols['prehash'], hash_name])
+
 
 def get_stash():
     cmd = Popen(['git', 'rev-parse', '--git-dir'], stdout=PIPE, stderr=PIPE)
     so, se = cmd.communicate()
-    stashFile = '%s%s' % (so.decode('utf-8').rstrip(),'/logs/refs/stash')
+    stash_file = '%s%s' % (so.decode('utf-8').rstrip(), '/logs/refs/stash')
 
     try:
-        with open(stashFile) as f:
+        with open(stash_file) as f:
             return sum(1 for _ in f)
     except IOError:
         return 0
 
+
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '--branch'], env={'LC_ALL': 'C'},
-           stdout=PIPE, stderr=PIPE)
-stdout, sterr = po.communicate()
+po = Popen(['git', 'status', '--porcelain', '--branch'], env={'LC_ALL': 'C'}, stdout=PIPE, stderr=PIPE)
+stdout, stderr = po.communicate()
 if po.returncode != 0:
     sys.exit(0)  # Not a git repository
 
 # collect git status information
 untracked, staged, changed, conflicts = [], [], [], []
-ahead, behind = 0, 0
+num_ahead, num_behind = 0, 0
+ahead, behind = '', ''
+branch = ''
 remote = ''
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
@@ -90,7 +86,7 @@ for st in status:
         if re.search('Initial commit on', st[2]):
             branch = st[2].split(' ')[-1]
         elif re.search('no branch', st[2]):  # detached status
-            branch = get_tagname_or_hash()
+            branch = get_tag_or_hash()
         elif len(st[2].strip().split('...')) == 1:
             branch = st[2].strip()
         else:
@@ -105,11 +101,12 @@ for st in status:
                 divergence = divergence.lstrip('[').rstrip(']')
                 for div in divergence.split(', '):
                     if 'ahead' in div:
-                        ahead = int(div[len('ahead '):].strip())
-                        remote += '%s%s' % (symbols['ahead of'], ahead)
+                        num_ahead = int(div[len('ahead '):].strip())
+                        ahead = '%s%s' % (symbols['ahead of'], num_ahead)
                     elif 'behind' in div:
-                        behind = int(div[len('behind '):].strip())
-                        remote += '%s%s' % (symbols['behind'], behind)
+                        num_behind = int(div[len('behind '):].strip())
+                        behind = '%s%s' % (symbols['behind'], num_behind)
+                remote = ''.join([behind, ahead])
     elif st[0] == '?' and st[1] == '?':
         untracked.append(st)
     else: