More version finding repair

When setup.py is run from an sdist distribution, it is expected that the
version will come from stgit/builtin_version.py which was generated when
the sdist was built. Thus setup.py is updated to look for the builtin
version along with the describe and archival versions.

Also repair stgit.version.git_archival_version() to strip the leading 'v'
from the tag to get the version-proper.

Signed-off-by: Peter Grayson <[email protected]>

Author: jpgrayson

setup.py

@@ -59,10 +59,21 @@ def __check_git_version():
 # ensure readable template files
 old_mask = os.umask(0o022)
 
-try:
-    ver = version.git_describe_version()
-except version.VersionUnavailable:
-    ver = version.git_archival_version()
+for get_ver in [
+    version.git_describe_version,
+    version.git_archival_version,
+    version.get_builtin_version,
+]:
+    try:
+        ver = get_ver()
+    except version.VersionUnavailable:
+        continue
+    else:
+        break
+else:
+    print('StGit version unavailable', file=sys.stderr)
+    sys.exit(1)
+
 with open('stgit/builtin_version.py', 'w') as f:
     print(
         '# This file is automatically generated. Do not edit.',

stgit/version.py

@@ -22,7 +22,7 @@ def git_describe_version():
         raise VersionUnavailable(str(e))
     m = re.match(r'^v([0-9].*)', v)
     if m:
-        v = m.group()
+        v = m.group(1)
     else:
         raise VersionUnavailable('bad version: %s' % v)
     try:
@@ -37,19 +37,22 @@ def git_describe_version():
 
 
 def git_archival_version():
-    tag_re = re.compile(r'(?<=\btag: )([^,]+)\b')
     archival_path = os.path.join(sys.path[0], '.git_archival.txt')
+    if not os.path.isfile(archival_path):
+        # The archival file will not be present in sdist archives.
+        raise VersionUnavailable('%s does not exist' % archival_path)
+    tag_re = re.compile(r'(?<=\btag: )([^,]+)\b')
     with open(archival_path) as f:
         for line in f:
             if line.startswith('ref-names:'):
-                tags = tag_re.findall(line)
-                if tags:
-                    return tags[0]
+                for tag in tag_re.findall(line):
+                    if tag.startswith('v'):
+                        return tag[1:]
         else:
             raise VersionUnavailable('no tags found in %s' % archival_path)
 
 
-def builtin_version():
+def get_builtin_version():
     try:
         import stgit.builtin_version
     except ImportError:
@@ -59,7 +62,7 @@ def builtin_version():
 
 
 def get_version():
-    for v in [builtin_version, git_describe_version, git_archival_version]:
+    for v in [get_builtin_version, git_describe_version, git_archival_version]:
         try:
             return v()
         except VersionUnavailable: