Split out commit log into it's own module

Author: tobami

codespeed/commits/__init__.py

@@ -0,0 +1 @@
+from .logs import get_logs

codespeed/git.py codespeed/commits/git.pycodespeed/git.py renamed to codespeed/commits/git.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def get_logs(rev, startrev, update=False):
+    logs = []
+
+    if rev.branch.project.repo_type == 'S':
+        from .subversion import getlogs, updaterepo
+    elif rev.branch.project.repo_type == 'M':
+        from .mercurial import getlogs, updaterepo
+    elif rev.branch.project.repo_type == 'G':
+        from .git import getlogs, updaterepo
+    elif rev.branch.project.repo_type == 'H':
+        from .github import getlogs, updaterepo
+    else:
+        if rev.branch.project.repo_type not in ("N", ""):
+            logger.warning("Don't know how to retrieve logs from %s project",
+                           rev.branch.project.get_repo_type_display())
+        return logs
+
+    if update:
+        updaterepo(rev.branch.project)
+
+    logs = getlogs(rev, startrev)
+
+    # Remove last log because the startrev log shouldn't be shown
+    if len(logs) > 1 and logs[-1].get('commitid') == startrev.commitid:
+        logs.pop()
+
+    return logs

codespeed/github.py codespeed/commits/github.pycodespeed/github.py renamed to codespeed/commits/github.py

@@ -4,11 +4,12 @@
 import logging
 from datetime import datetime
 from django.core.exceptions import ValidationError
-
 from django.conf import settings
+
 from codespeed.models import (Environment, Executable, Revision,
                               Project, Branch, Benchmark,
                               Result, Report)
+from codespeed import commits
 
 logger = logging.getLogger(__name__)
 
@@ -156,45 +157,6 @@ def getcomparisonexes():
     return all_executables, exekeys
 
 
-def getcommitlogs(rev, startrev, update=False):
-    logs = []
-
-    if rev.branch.project.repo_type == 'S':
-        from codespeed.subversion import getlogs, updaterepo
-    elif rev.branch.project.repo_type == 'M':
-        from codespeed.mercurial import getlogs, updaterepo
-    elif rev.branch.project.repo_type == 'G':
-        from codespeed.git import getlogs, updaterepo
-    elif rev.branch.project.repo_type == 'H':
-        from codespeed.github import getlogs, updaterepo
-    else:
-        if rev.branch.project.repo_type not in ("N", ""):
-            logger.warning("Don't know how to retrieve logs from %s project",
-                           rev.branch.project.get_repo_type_display())
-        return logs
-
-    if update:
-        updaterepo(rev.branch.project)
-
-    logs = getlogs(rev, startrev)
-
-    # Remove last log because the startrev log shouldn't be shown
-    if len(logs) > 1 and logs[-1].get('commitid') == startrev.commitid:
-        logs.pop()
-
-    return logs
-
-
-def saverevisioninfo(rev):
-    log = getcommitlogs(rev, rev, update=True)
-
-    if log:
-        log = log[0]
-        rev.author = log['author']
-        rev.date = log['date']
-        rev.message = log['message']
-
-
 def validate_result(item):
     """
     Validates that a result dictionary has all needed parameters
@@ -290,10 +252,17 @@ def save_result(data):
             return str(e), True
         if p.repo_type not in ("N", ""):
             try:
-                saverevisioninfo(rev)
+                commit_logs = commits.get_logs(rev, rev, update=True)
             except RuntimeError as e:
                 logger.warning("unable to save revision %s info: %s", rev, e,
                                exc_info=True)
+            else:
+                if commit_logs:
+                    log = commit_logs[0]
+                    rev.author = log['author']
+                    rev.date = log['date']
+                    rev.message = log['message']
+
         rev.save()
 
     exe, created = Executable.objects.get_or_create(

codespeed/commits/logs.py

@@ -16,8 +16,8 @@
                               Executable, Benchmark, Branch)
 from codespeed.domain import (get_default_environment, getbaselineexecutables,
                               getdefaultexecutable, getcomparisonexes,
-                              getcommitlogs, save_result,
-                              create_report_if_enough_data)
+                              save_result, create_report_if_enough_data)
+from codespeed import commits
 
 logger = logging.getLogger(__name__)
 
@@ -76,7 +76,8 @@ def getcomparisondata(request):
                 ).values_list('benchmark', 'value'))
 
                 for bench in benchmarks:
-                    compdata[exe['key']][env.id][bench.id] = results.get(bench.id, None)
+                    compdata[exe['key']][env.id][bench.id] = results.get(
+                        bench.id, None)
 
     compdata['error'] = "None"
 
@@ -334,7 +335,7 @@ def gettimelinedata(request):
 def timeline(request):
     data = request.GET
 
-    ## Configuration of default parameters ##
+    # Configuration of default parameters #
     # Default Environment
     enviros = Environment.objects.all()
     if not enviros:
@@ -564,7 +565,7 @@ def changes(request):
 
     for project, revisions in revisionlists.items():
         revisionlists[project] = [
-            (unicode(rev), rev.commitid) for rev in revisions
+            (str(rev), rev.commitid) for rev in revisions
         ]
     revisionlists = json.dumps(revisionlists)
 
@@ -624,7 +625,7 @@ def displaylogs(request):
         else:
             startrev = startrev[0]
 
-        remotelogs = getcommitlogs(rev, startrev)
+        remotelogs = commits.get_logs(rev, startrev)
         if len(remotelogs):
             try:
                 if remotelogs[0]['error']:

codespeed/mercurial.py codespeed/commits/mercurial.pycodespeed/mercurial.py renamed to codespeed/commits/mercurial.py

@@ -59,9 +59,8 @@
     # Define a class that logs unhandled errors
     class LogUncatchedErrors:
         def process_exception(self, request, exception):
-            logging.error("Unhandled Exception on request for %s\n%s" %
-                                 (request.build_absolute_uri(),
-                                  traceback.format_exc()))
+            logging.error("Unhandled Exception on request for %s\n%s",
+                          request.build_absolute_uri(), traceback.format_exc())
     # And add it to the middleware classes
     MIDDLEWARE_CLASSES += ('sample_project.settings.LogUncatchedErrors',)