Merge branch 'master' into speed.python.org

Updates from upstream

Author: zware

.travis.yml

@@ -1,18 +1,10 @@
 language: python
 python:
-  - 2.6
   - 2.7
   - 3.4
 env:
   - DJANGO_VERSION=1.8.5
   - DJANGO_VERSION=1.6.11
-  - DJANGO_VERSION=1.4.22
-matrix:
-  exclude:
-    - python: 2.6
-      env: DJANGO_VERSION=1.8.5
-    - python: 3.4
-      env: DJANGO_VERSION=1.4.22
 install:
   - pip install -q Django==$DJANGO_VERSION
   - python setup.py install

codespeed/commits/__init__.py

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

codespeed/commits/exceptions.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+
+class CommitLogError(Exception):
+    """An error when trying to display commit log messages"""

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

@@ -5,6 +5,7 @@
 
 from django.conf import settings
 
+from .exceptions import CommitLogError
 
 logger = logging.getLogger(__name__)
 
@@ -19,8 +20,8 @@ def updaterepo(project, update=True):
 
         stdout, stderr = p.communicate()
         if p.returncode != 0:
-            raise RuntimeError("git pull returned %s: %s" % (p.returncode,
-                                                                stderr))
+            raise CommitLogError("git pull returned %s: %s" % (p.returncode,
+                                                               stderr))
         else:
             return [{'error': False}]
     else:
@@ -32,7 +33,7 @@ def updaterepo(project, update=True):
         stdout, stderr = p.communicate()
 
         if p.returncode != 0:
-            raise RuntimeError("%s returned %s: %s" % (
+            raise CommitLogError("%s returned %s: %s" % (
                 " ".join(cmd), p.returncode, stderr))
         else:
             return [{'error': False}]
@@ -58,8 +59,8 @@ def getlogs(endrev, startrev):
     stdout, stderr = p.communicate()
 
     if p.returncode != 0:
-        raise RuntimeError("%s returned %s: %s" % (
-                            " ".join(cmd), p.returncode, stderr))
+        raise CommitLogError("%s returned %s: %s" % (
+                             " ".join(cmd), p.returncode, stderr))
     logs = []
     for log in filter(None, stdout.split("\x1e")):
         (short_commit_id, commit_id, date_t, author_name, author_email,

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

@@ -5,6 +5,8 @@
 Among other things, this means that the codespeed server doesn't need to have
 git installed, the ability to write files, etc.
 """
+from __future__ import absolute_import
+
 import logging
 import urllib
 import re
@@ -13,6 +15,8 @@
 import isodate
 from django.core.cache import cache
 
+from .exceptions import CommitLogError
+
 logger = logging.getLogger(__name__)
 
 GITHUB_URL_RE = re.compile(
@@ -52,7 +56,7 @@ def retrieve_revision(commit_id, username, project, revision=None):
             cache.set(commit_url, commit_json, 86400 * 30)
 
     if commit_json["message"] in ("Not Found", "Server Error",):
-         raise RuntimeError("Unable to load %s: %s" % (commit_url, commit_json["message"]))
+         raise CommitLogError("Unable to load %s: %s" % (commit_url, commit_json["message"]))
 
     date = isodate.parse_datetime(commit_json['committer']['date'])
 

codespeed/commits/logs.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 = []
+    project = rev.branch.project
+    if project.repo_type == project.SUBVERSION:
+        from .subversion import getlogs, updaterepo
+    elif project.repo_type == project.MERCURIAL:
+        from .mercurial import getlogs, updaterepo
+    elif project.repo_type == project.GIT:
+        from .git import getlogs, updaterepo
+    elif project.repo_type == project.GITHUB:
+        from .github import getlogs, updaterepo
+    else:
+        if project.repo_type not in (project.NO_LOGS, ""):
+            logger.warning("Don't know how to retrieve logs from %s project",
+                           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/mercurial.py codespeed/commits/mercurial.pycodespeed/mercurial.py renamed to codespeed/commits/mercurial.py

@@ -1,10 +1,14 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
 import os
 import datetime
 from subprocess import Popen, PIPE
 import logging
 
 from django.conf import settings
 
+from .exceptions import CommitLogError
 
 logger = logging.getLogger(__name__)
 
@@ -19,8 +23,8 @@ def updaterepo(project, update=True):
         stdout, stderr = p.communicate()
 
         if p.returncode != 0 or stderr:
-            raise RuntimeError("hg pull returned %s: %s" % (p.returncode,
-                                                                stderr))
+            raise CommitLogError("hg pull returned %s: %s" % (p.returncode,
+                                                              stderr))
         else:
             return [{'error': False}]
     else:
@@ -34,9 +38,9 @@ def updaterepo(project, update=True):
         stdout, stderr = p.communicate()
 
         if p.returncode != 0:
-            raise RuntimeError("%s returned %s: %s" % (" ".join(cmd),
-                                                        p.returncode,
-                                                        stderr))
+            raise CommitLogError("%s returned %s: %s" % (" ".join(cmd),
+                                                         p.returncode,
+                                                         stderr))
         else:
             return [{'error': False}]
 
@@ -53,7 +57,7 @@ def getlogs(endrev, startrev):
     stdout, stderr = p.communicate()
 
     if p.returncode != 0:
-        raise RuntimeError(str(stderr))
+        raise CommitLogError(str(stderr))
     else:
         stdout = stdout.rstrip('\n')  # Remove last newline
         logs = []

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

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
-'''Subversion commit logs support'''
+"""Subversion commit logs support"""
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
 from datetime import datetime
 
+from .exceptions import CommitLogError
+
 
 def updaterepo(project):
     """Not needed for a remote subversion repo"""
@@ -34,9 +39,9 @@ def get_login(realm, username, may_save):
                 )
             )
     except pysvn.ClientError as e:
-        raise RuntimeError(e.args)
+        raise CommitLogError(e.args)
     except ValueError:
-        raise RuntimeError(
+        raise CommitLogError(
             "'%s' is an invalid subversion revision number" % newrev.commitid)
     log_messages.reverse()
     s = len(log_messages)