Avoid varying git archive content for ref; rework versioning

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

diff --git a/lib/cmd/version-cmd.py b/lib/cmd/version-cmd.py
index f158c91c86f5458fc99111cd900a5cce93172dc7..dac15e856cd728e53a0ff6f823500a829bf55350 100755 (executable)
--- a/lib/cmd/version-cmd.py
+++ b/lib/cmd/version-cmd.py
@@ -20,56 +20,30 @@ import os.path, re, sys
 sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
 
 from bup import compat, options, version
+from bup.io import byte_stream
 
 version_rx = re.compile(r'^[0-9]+\.[0-9]+(\.[0-9]+)?(-[0-9]+-g[0-9abcdef]+)?$')
 
 optspec = """
-bup version [--date|--commit|--tag]
+bup version [--date|--commit]
 --
 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(optspec)
 opt, flags, extra = o.parse(compat.argv[1:])
 
 
-total = (opt.date or 0) + (opt.commit or 0) + (opt.tag or 0)
+total = (opt.date or 0) + (opt.commit 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: ') and version_rx.match(n[5:]):
-            return n[5:]
-    return 'unknown-%s' % version.COMMIT[:7]
-
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
 
 if opt.date:
-    print(version_date())
+    out.write(version.date.split(' ')[0] + b'\n')
 elif opt.commit:
-    print(version_commit())
+    out.write(version.commit + b'\n')
 else:
-    print(version_tag())
+    out.write(version.version + b'\n')