Add CommitLogError exception

Author: tobami

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

codespeed/results.py

@@ -88,7 +88,7 @@ def save_result(data):
         if p.repo_type not in ("N", ""):
             try:
                 commit_logs = commits.get_logs(rev, rev, update=True)
-            except RuntimeError as e:
+            except CommitLogError as e:
                 logger.warning("unable to save revision %s info: %s", rev, e,
                                exc_info=True)
             else:

codespeed/views.py

@@ -634,12 +634,11 @@ def displaylogs(request):
                 pass  # no errors
             logs = remotelogs
         else:
-            error = 'no logs found'
-    except (StandardError, RuntimeError) as e:
-        logger.error(
-            "Unhandled exception displaying logs for %s: %s",
-            rev, e, exc_info=True)
-        error = repr(e)
+            error = 'No logs found'
+    except commits.exceptions.CommitLogError as e:
+        logger.error('Unhandled exception displaying logs for %s: %s',
+                     rev, e, exc_info=True)
+        error = str(e)
 
     # Add commit browsing url to logs
     project = rev.branch.project
@@ -648,8 +647,10 @@ def displaylogs(request):
 
     return render_to_response(
         'codespeed/changes_logs.html',
-        {'error': error, 'logs': logs,
-         'show_email_address': settings.SHOW_AUTHOR_EMAIL_ADDRESS},
+        {
+            'error': error, 'logs': logs,
+            'show_email_address': settings.SHOW_AUTHOR_EMAIL_ADDRESS
+        },
         context_instance=RequestContext(request))