[GNUnet-SVN] r24897 - gauger

[gnunet]

Author: LRN
Date: 2012-11-11 00:18:42 +0100 (Sun, 11 Nov 2012)
New Revision: 24897

Modified:
   gauger/gauger
Log:
Support getting svn rev from git-svn repo

Modified: gauger/gauger
===================================================================
--- gauger/gauger       2012-11-10 23:18:39 UTC (rev 24896)
+++ gauger/gauger       2012-11-10 23:18:42 UTC (rev 24897)
@@ -26,6 +26,7 @@
 import os
 import subprocess
 import urllib
+import re
 
 if(sys.version_info[0] == 2 and sys.version_info[1] < 7):
     import ap27 as arg_parser
@@ -52,6 +53,12 @@
     return (svnversion() > 0)
 
 def gitversion():
+    p = subprocess.Popen("git log -1 | grep git-svn-id",
+      shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = p.communicate ()
+    m = re.match (r'\s+git-svn-id: .+@([0-9]+) .*', stdout)
+    if m:
+        return int (m.group (1))
     p = subprocess.Popen("git log | grep ^commit | wc -l", shell=True,
       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (stdout, stderr) = p.communicate()