Extract 'tag' information for the given revision for Mercurial and Git repos

For Mercurial, do not save the 'tip' tag.

Author: octmoraru

codespeed/commits/git.py

@@ -66,11 +66,21 @@ def getlogs(endrev, startrev):
         (short_commit_id, commit_id, date_t, author_name, author_email,
             subject, body) = log.split("\x00", 7)
 
+        tag = ""
+
+        cmd = ["git", "describe", "--tags", commit_id]
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=working_copy)
+
+        stdout, stderr = p.communicate()
+
+        if p.returncode == 0:
+            tag = stdout
+
         date = datetime.datetime.fromtimestamp(
             int(date_t)).strftime("%Y-%m-%d %H:%M:%S")
 
         logs.append({'date': date, 'message': subject, 'commitid': commit_id,
                      'author': author_name, 'author_email': author_email,
-                     'body': body, 'short_commit_id': short_commit_id})
+                     'body': body, 'short_commit_id': short_commit_id, 'tag': tag})
 
     return logs

codespeed/commits/mercurial.py

@@ -50,7 +50,7 @@ def getlogs(endrev, startrev):
 
     cmd = ["hg", "log",
             "-r", "%s::%s" % (startrev.commitid, endrev.commitid),
-            "--template", "{rev}:{node|short}\n{node}\n{author|user}\n{author|email}\n{date}\n{desc}\n=newlog=\n"]
+            "--template", "{rev}:{node|short}\n{node}\n{author|user}\n{author|email}\n{date}\n{tags}\n{desc}\n=newlog=\n"]
 
     working_copy = endrev.branch.project.working_copy
     p = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=working_copy)
@@ -64,7 +64,7 @@ def getlogs(endrev, startrev):
         for log in stdout.split("=newlog=\n"):
             elements = []
             elements = log.split('\n')[:-1]
-            if len(elements) < 6:
+            if len(elements) < 7:
                 # "Malformed" log
                 logs.append(
                     {'date': '-', 'message': 'error parsing log', 'commitid': '-'})
@@ -74,6 +74,8 @@ def getlogs(endrev, startrev):
                 author_name = elements.pop(0)
                 author_email = elements.pop(0)
                 date = elements.pop(0)
+                tag = elements.pop(0)
+                tag = "" if tag == "tip" else tag
                 # All other newlines should belong to the description text. Join.
                 message = '\n'.join(elements)
 
@@ -85,7 +87,7 @@ def getlogs(endrev, startrev):
                 logs.append({
                     'date': date, 'author': author_name,
                     'author_email': author_email, 'message': message,
-                    'short_commit_id': short_commit_id, 'commitid': commit_id})
+                    'short_commit_id': short_commit_id, 'commitid': commit_id, 'tag': tag})
     # Remove last log here because mercurial saves the short hast as commitid now
     if len(logs) > 1 and logs[-1].get('short_commit_id') == startrev.commitid:
         logs.pop()

codespeed/results.py

@@ -97,6 +97,7 @@ def save_result(data):
                     rev.author = log['author']
                     rev.date = log['date']
                     rev.message = log['message']
+                    rev.tag = log['tag']
 
         rev.save()