Add "-dirty" flag to versions build out of uncommitted source

Author: mjuric

src/lsd/version.py

@@ -17,16 +17,27 @@ def _minimal_ext_cmd(cmd):
 		env['LANGUAGE'] = 'C'
 		env['LANG'] = 'C'
 		env['LC_ALL'] = 'C'
-		out = subprocess.Popen(cmd, stdout = subprocess.PIPE, env=env).communicate()[0]
+		out = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=open('/dev/null', 'w'), env=env).communicate()[0]
 		return out
 
 	import os, subprocess
 	base, _ = os.path.split(__file__)
 
 	tag = "<<unknown>>"
 	try:
-		cmd = ['git', '--work-tree', '%s/../..' % base, 'describe', '--long', '--abbrev=8']
+		# Have to call 'git status' first, because of a git bug where it incorrectly detects
+		# a tree as dirty under conditions triggered by things like './setup.py sdist'
+		cmd = ['git', '--work-tree', '%s/../..' % base, 'status']
+		_minimal_ext_cmd(cmd)
+
+		# Try with the --dirty flag (newer versions of git support this)
+		cmd = ['git', '--work-tree', '%s/../..' % base, 'describe', '--long', '--abbrev=8', '--dirty']
 		tag = _minimal_ext_cmd(cmd)
+
+		if tag == "":
+			# Try without the --dirty flag (for older versions of git)
+			cmd = ['git', '--work-tree', '%s/../..' % base, 'describe', '--long', '--abbrev=8']
+			tag = _minimal_ext_cmd(cmd)
 	except OSError:
 		pass
 
@@ -36,17 +47,19 @@ def _minimal_ext_cmd(cmd):
 if tag[:1] == 'v':
 	tag = tag[1:]
 	# Parse the tag into components
-	(version, additional_commits, hash) = tag.split('-')
+	tagparts = tag.split('-')
+	(version, additional_commits, hash) = tagparts[:3]
+	dirty = len(tagparts) > 3
 	ver_tuple = tuple( int(v) for v in version.split('.') )
 	additional_commits = int(additional_commits)
 	hash = hash[1:]
 
-	if additional_commits == 0:
+	if additional_commits == 0 and not dirty:
 		__version__ = version
 	else:
 		__version__ = tag
 
-	__version_info__ = (ver_tuple, additional_commits, hash)
+	__version_info__ = (ver_tuple, additional_commits, hash, dirty)
 else:
 	__version__ = tag
-	__version_info__ = ((99, 99, 99), 99, '0'*8)
+	__version_info__ = ((99, 99, 99), 99, '0'*8, True)