From cb6873c2f63d9bdd1486118c2f884164c507592c Mon Sep 17 00:00:00 2001 From: urlbot Date: Fri, 28 Nov 2014 19:33:52 +0100 Subject: [PATCH] add version id counter in get_version_git() --- common.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common.py b/common.py index 5725750..42c786a 100644 --- a/common.py +++ b/common.py @@ -67,13 +67,17 @@ def levenshtein(a, b, return_table=False): def get_version_git(): import subprocess - cmd = ['git', 'log', '-n', '1', '--oneline', '--abbrev-commit'] + cmd = ['git', 'log', '--oneline', '--abbrev-commit'] p = subprocess.Popen(cmd, bufsize=1, stdout=subprocess.PIPE) first_line = p.stdout.readline() + line_count = len(p.stdout.readlines()) + 1 if 0 == p.wait(): - return "version (Git) '%s'" % str(first_line.strip(), encoding='utf8') + # skip this 1st, 2nd, 3rd stuff and use always [0-9]th + return "version (Git, %dth rev) '%s'" % ( + line_count, str(first_line.strip(), encoding='utf8') + ) else: return "(unknown version)"