index: remove vestigial buffer and sys imports

[bup.git] / cmd / version-cmd.py

diff --git a/cmd/version-cmd.py b/cmd/version-cmd.py
index 1964ca0187ebe16eed0b81129d652c4509ddcefd..f7555a8aeaef8078d617cc41c1b7df089139cc46 100755 (executable)
--- a/cmd/version-cmd.py
+++ b/cmd/version-cmd.py
@@ -1,6 +1,17 @@
-#!/usr/bin/env python
-import sys, os, glob
-from bup import options, _version
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+from __future__ import absolute_import, print_function
+import re, sys
+
+from bup import options
+from bup import version
+
+version_rx = re.compile(r'^[0-9]+\.[0-9]+(\.[0-9]+)?(-[0-9]+-g[0-9abcdef]+)?$')
 
 optspec = """
 bup version [--date|--commit|--tag]
@@ -9,27 +20,46 @@ date    display the date this version of bup was created
 commit  display the git commit id of this version of bup
 tag     display the tag name of this version.  If no tag is available, display the commit id
 """
-o = options.Options('bup version', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
-def autoname(names):
-    names = names.strip()
+
+total = (opt.date or 0) + (opt.commit or 0) + (opt.tag or 0)
+if total > 1:
+    o.fatal('at most one option expected')
+
+
+def version_date():
+    """Format bup's version date string for output."""
+    return version.DATE.split(' ')[0]
+
+
+def version_commit():
+    """Get the commit hash of bup's current version."""
+    return version.COMMIT
+
+
+def version_tag():
+    """Format bup's version tag (the official version number).
+
+    When generated from a commit other than one pointed to with a tag, the
+    returned string will be "unknown-" followed by the first seven positions of
+    the commit hash.
+    """
+    names = version.NAMES.strip()
     assert(names[0] == '(')
     assert(names[-1] == ')')
     names = names[1:-1]
     l = [n.strip() for n in names.split(',')]
     for n in l:
-        if n.startswith('tag: bup-'):
-            return n[9:]
+        if n.startswith('tag: ') and version_rx.match(n[5:]):
+            return n[5:]
+    return 'unknown-%s' % version.COMMIT[:7]
 
 
-total = (opt.date or 0) + (opt.commit or 0) + (opt.tag or 0)
-if total > 1:
-    o.fatal('at most one option expected')
-
 if opt.date:
-    print _version.DATE.split(' ')[0]
+    print(version_date())
 elif opt.commit:
-    print _version.COMMIT
+    print(version_commit())
 else:
-    print autoname(_version.NAMES) or 'unknown-%s' % _version.COMMIT[:7]
+    print(version_tag())