Merge pull request tobami#207 from octmoraru/tag_save

Tag saving features

Author: tobami

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/github.py

@@ -33,34 +33,53 @@ def updaterepo(project, update=True):
     return
 
 
-def retrieve_revision(commit_id, username, project, revision=None):
-    commit_url = 'https://api.github.com/repos/%s/%s/git/commits/%s' % (
-        username, project, commit_id)
-
-    commit_json = cache.get(commit_url)
+def fetch_json(url):
+    json_obj = cache.get(url)
 
-    if commit_json is None:
+    if json_obj is None:
         try:
-            commit_json = json.load(urllib.urlopen(commit_url))
+            json_obj = json.load(urllib.urlopen(url))
         except IOError as e:
             logger.exception("Unable to load %s: %s",
-                             commit_url, e, exc_info=True)
+                             url, e, exc_info=True)
             raise e
 
-        if commit_json["message"] in ("Not Found", "Server Error",):
+        if "message" in json_obj and \
+           json_obj["message"] in ("Not Found", "Server Error",):
             # We'll still cache these for a brief period of time to avoid
             # making too many requests:
-            cache.set(commit_url, commit_json, 300)
+            cache.set(url, json_obj, 300)
         else:
             # We'll cache successes for a very long period of time since
             # SCM diffs shouldn't change:
-            cache.set(commit_url, commit_json, 86400 * 30)
+            cache.set(url, json_obj, 86400 * 30)
 
-    if commit_json["message"] in ("Not Found", "Server Error",):
+    if "message" in json_obj and \
+       json_obj["message"] in ("Not Found", "Server Error",):
         raise CommitLogError(
-            "Unable to load %s: %s" % (commit_url, commit_json["message"]))
+            "Unable to load %s: %s" % (url, json_obj["message"]))
+
+    return json_obj
+
+
+def retrieve_tag(commit_id, username, project):
+    tags_url = 'https://api.github.com/repos/%s/%s/git/refs/tags' % (
+        username, project)
+
+    tags_json = fetch_json(tags_url)
+    for tag in tags_json:
+        if tag['object']['sha'] == commit_id:
+            return tag['ref'].split("refs/tags/")[-1]
+
+
+def retrieve_revision(commit_id, username, project, revision=None):
+    commit_url = 'https://api.github.com/repos/%s/%s/git/commits/%s' % (
+        username, project, commit_id)
+
+    commit_json = fetch_json(commit_url)
 
     date = isodate.parse_datetime(commit_json['committer']['date'])
+    tag = retrieve_tag(commit_id, username, project)
 
     if revision:
         # Overwrite any existing data we might have for this revision since
@@ -82,7 +101,8 @@ def retrieve_revision(commit_id, username, project, revision=None):
             'author_email': commit_json['author']['email'],
             'commitid':     commit_json['sha'],
             'short_commit_id': commit_json['sha'][0:7],
-            'parents':      commit_json['parents']}
+            'parents':      commit_json['parents'],
+            'tag':          tag}
 
 
 def getlogs(endrev, startrev):

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/commits/subversion.py

@@ -13,6 +13,17 @@ def updaterepo(project):
     return [{'error': False}]
 
 
+def get_tag(rev_num, repo_path, client):
+    tags_url = repo_path + '/tags'
+    tags = client.ls(tags_url)
+
+    for tag in tags:
+        if 'created_rev' in tag and tag['created_rev'].number == rev_num:
+            if 'name' in tag:
+                return tag['name'].split('/')[-1]
+    return ''
+
+
 def getlogs(newrev, startrev):
     import pysvn
 
@@ -56,8 +67,10 @@ def get_login(realm, username, may_save):
             author = ""
         date = datetime.fromtimestamp(log.date).strftime("%Y-%m-%d %H:%M:%S")
         message = log.message
+        tag = get_tag(log.revision.number,
+                      newrev.branch.project.repo_path, client)
         # Add log unless it is the last commit log, which has already been tested
         logs.append({
             'date': date, 'author': author, 'message': message,
-            'commitid': log.revision.number})
+            'commitid': log.revision.number, 'tag': tag})
     return logs

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()
 

codespeed/static/js/timeline.js

@@ -82,15 +82,15 @@ function getHighlighterConfig(median) {
     return {
       show: true,
       tooltipLocation: 'nw',
-      yvalues: 7,
-      formatString:'<table class="jqplot-highlighter">    <tr><td>date:</td><td>%s</td></tr> <tr><td>median:</td><td>%s</td></tr> <tr><td>max:</td><td>%s</td></tr> <tr><td>Q3:</td><td>%s</td></tr> <tr><td>Q1:</td><td>%s</td></tr> <tr><td>min:</td><td>%s</td></tr> <tr><td>commit:</td><td>%s</td></tr></table>'
+      yvalues: 8,
+      formatString:'<table class="jqplot-highlighter">    <tr><td>date:</td><td>%s</td></tr> <tr><td>median:</td><td>%s</td></tr> <tr><td>max:</td><td>%s</td></tr> <tr><td>Q3:</td><td>%s</td></tr> <tr><td>Q1:</td><td>%s</td></tr> <tr><td>min:</td><td>%s</td></tr> <tr><td>commit:</td><td>%s</td></tr><tr><td>tag:</td><td>%s</td></tr></table>'
     };
   } else {
     return {
       show: true,
       tooltipLocation: 'nw',
-      yvalues: 4,
-      formatString:'<table class="jqplot-highlighter">    <tr><td>date:</td><td>%s</td></tr> <tr><td>result:</td><td>%s</td></tr> <tr><td>std dev:</td><td>%s</td></tr> <tr><td>commit:</td><td>%s</td></tr></table>'
+      yvalues: 5,
+      formatString:'<table class="jqplot-highlighter">    <tr><td>date:</td><td>%s</td></tr> <tr><td>result:</td><td>%s</td></tr> <tr><td>std dev:</td><td>%s</td></tr> <tr><td>commit:</td><td>%s</td></tr><tr><td>tag:</td><td>%s</td></tr></table>'
     };
   }
 }

codespeed/views.py

@@ -306,7 +306,7 @@ def gettimelinedata(request):
                             [
                                 res.revision.date.strftime('%Y/%m/%d %H:%M:%S %z'),
                                 res.value, val_max, q3, q1, val_min,
-                                res.revision.get_short_commitid(), branch
+                                res.revision.get_short_commitid(), res.revision.tag, branch
                             ]
                         )
                     else:
@@ -317,7 +317,7 @@ def gettimelinedata(request):
                             [
                                 res.revision.date.strftime('%Y/%m/%d %H:%M:%S %z'),
                                 res.value, std_dev,
-                                res.revision.get_short_commitid(), branch
+                                res.revision.get_short_commitid(), res.revision.tag, branch
                             ]
                         )
                 timeline['branches'][branch][executable] = results