Merge pull request #224 from tobami/default-banch-in-db

Default banch in db

Author: tobami

README.md

@@ -185,10 +185,6 @@ several parameters (the file includes comments with full examples).
     * `grid`: will always show as default the grid of plots
     * `show_none`: will show a text message (better default when there are lots of benchmarks)
     * `mybench`: will select benchmark named "mybench"
-* `DEF_BRANCH`: Defines the default branch to be used when calculating timeline and changes data for presentation.  Example values:
-    * `default`: the default value, and usually mercurial's default branch
-    * `master`: usually git's default branch
-    * `trunk`: usually SVN's default branch
 
 ### Comparison View
 * `CHART_TYPE`: Chooses the default chart type (normal bars, stacked bars or

codespeed/admin.py

@@ -1,15 +1,39 @@
 # -*- coding: utf-8 -*-
 
+from django import forms
+from django.contrib import admin
+
 from codespeed.models import (Project, Revision, Executable, Benchmark, Branch,
                               Result, Environment, Report)
 
-from django.contrib import admin
+
+class ProjectForm(forms.ModelForm):
+
+    default_branch = forms.CharField(max_length=32, required=False)
+
+    def clean(self):
+        if not self.cleaned_data.get('default_branch'):
+            repo_type = self.cleaned_data['repo_type']
+            if repo_type in [Project.GIT, Project.GITHUB]:
+                self.cleaned_data['default_branch'] = "master"
+            elif repo_type == Project.MERCURIAL:
+                self.cleaned_data['default_branch'] = "default"
+            elif repo_type == Project.SUBVERSION:
+                self.cleaned_data['default_branch'] = "trunk"
+            else:
+                self.add_error('default_branch', 'This field is required.')
+
+    class Meta:
+        model = Project
+        fields = '__all__'
 
 
 @admin.register(Project)
 class ProjectAdmin(admin.ModelAdmin):
     list_display = ('name', 'repo_type', 'repo_path', 'track')
 
+    form = ProjectForm
+
 
 @admin.register(Branch)
 class BranchAdmin(admin.ModelAdmin):

codespeed/feeds.py

@@ -35,15 +35,14 @@ def get_context_data(self, **kwargs):
 
 
 class LatestEntries(ResultFeed):
-    description = "Last benchmark runs"
+    description = "Last Results"
 
     def result_filter(self):
-        return Q(revision__branch__name=settings.DEF_BRANCH)
+        return Q()
 
 
 class LatestSignificantEntries(ResultFeed):
-    description = "Last benchmark runs with significant changes"
+    description = "Last results with significant changes"
 
     def result_filter(self):
-        return Q(revision__branch__name=settings.DEF_BRANCH,
-                 colorcode__in=('red', 'green'))
+        return Q(colorcode__in=('red', 'green'))

codespeed/fixtures/timeline_tests.json

@@ -3,26 +3,28 @@
         "pk": 1,
         "model": "codespeed.project",
         "fields": {
-            "repo_type": "N",
+            "repo_type": "G",
             "name": "MyProject",
             "commit_browsing_url": "",
             "repo_user": "",
             "track": true,
             "repo_pass": "",
-            "repo_path": ""
+            "repo_path": "",
+            "default_branch": "master"
         }
     },
     {
         "pk": 2,
         "model": "codespeed.project",
         "fields": {
-            "repo_type": "N",
+            "repo_type": "M",
             "name": "Other",
             "commit_browsing_url": "",
             "repo_user": "",
             "track": true,
             "repo_pass": "",
-            "repo_path": ""
+            "repo_path": "",
+            "default_branch": "default"
         }
     },
     {
@@ -35,7 +37,8 @@
             "repo_user": "",
             "track": false,
             "repo_pass": "",
-            "repo_path": ""
+            "repo_path": "",
+            "default_branch": "master"
         }
     },
     {
@@ -59,7 +62,7 @@
         "model": "codespeed.branch",
         "fields": {
             "project": 2,
-            "name": "master"
+            "name": "default"
         }
     },
     {

codespeed/migrations/0003_project_default_branch.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-08-04 03:45
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def get_default_branch_name():
+    from django.conf import settings
+    try:
+        return settings.DEF_BRANCH
+    except AttributeError:
+        return "master"
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codespeed', '0002_median'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='default_branch',
+            field=models.CharField(default=get_default_branch_name, max_length=32),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='branch',
+            name='name',
+            field=models.CharField(max_length=32),
+        ),
+    ]

codespeed/models.py

@@ -42,6 +42,7 @@ class Project(models.Model):
     commit_browsing_url = models.CharField("Commit browsing URL",
                                            blank=True, max_length=200)
     track = models.BooleanField("Track changes", default=True)
+    default_branch = models.CharField(max_length=32)
 
     def __str__(self):
         return self.name
@@ -103,7 +104,7 @@ def is_less_important_than(self, val, color):
 
 @python_2_unicode_compatible
 class Branch(models.Model):
-    name = models.CharField(max_length=20)
+    name = models.CharField(max_length=32)
     project = models.ForeignKey(Project, related_name="branches")
 
     def __str__(self):
@@ -138,7 +139,7 @@ def __str__(self):
         else:
             date = self.date.strftime("%b %d, %H:%M")
         string = " - ".join(filter(None, (date, self.commitid, self.tag)))
-        if self.branch.name != settings.DEF_BRANCH:
+        if self.branch.name != self.branch.project.default_branch:
             string += " - " + self.branch.name
         return string
 

codespeed/results.py

@@ -134,6 +134,9 @@ def save_result(data):
 
 def create_report_if_enough_data(rev, exe, e):
     """Triggers Report creation when there are enough results"""
+    if exe.project.track is not True:
+        return False
+
     last_revs = Revision.objects.filter(
         branch=rev.branch
     ).order_by('-date')[:2]

codespeed/settings.py

@@ -6,9 +6,6 @@
 
 DEF_ENVIRONMENT = None # Name of the environment which should be selected as default
 
-DEF_BRANCH = "master" # Defines the default branch to be used.
-                      # In git projects, this branch is usually called "master"
-
 DEF_BASELINE = None # Which executable + revision should be default as a baseline
                     # Given as the name of the executable and commitid of the revision
                     # Example: defaultbaseline = {'executable': 'myexe', 'revision': '21'}

codespeed/tests/test_views.py

@@ -3,7 +3,6 @@
 import copy
 import json
 
-from django.conf import settings
 from django.test import TestCase, override_settings
 from django.core.urlresolvers import reverse
 
@@ -342,19 +341,24 @@ def test_gettimelinedata(self):
             "base": "2+4",
             "ben": "float",
             "env": "1",
-            "revs": 2
+            "revs": "2"
         }
         response = self.client.get(path, data)
         self.assertEquals(response.status_code, 200)
         responsedata = json.loads(response.content.decode())
+
         self.assertEquals(
             responsedata['error'], "None", "there should be no errors")
         self.assertEquals(
             len(responsedata['timelines']), 1, "there should be 1 benchmark")
         self.assertEquals(
-            len(responsedata['timelines'][0]['branches']['master']),
+            len(responsedata['timelines'][0]['branches']),
             2,
-            "there should be 2 timelines")
+            "there should be 2 branches")
+        self.assertEquals(
+            len(responsedata['timelines'][0]['branches']['default']),
+            1,
+            "there should be 1 timeline for master")
         self.assertEquals(
             len(responsedata['timelines'][0]['branches']['master']['1']),
             2,
@@ -371,7 +375,7 @@ def setUp(self):
         Environment.objects.create(name='Dual Core', cpu='Core 2 Duo 8200')
         self.data = {
             'commitid': 'abcd1',
-            'branch': settings.DEF_BRANCH,
+            'branch': 'master',
             'project': 'MyProject',
             'executable': 'myexe O3 64bits',
             'benchmark': 'float',
@@ -399,3 +403,13 @@ def test_reports_post_returns_405(self):
         response = self.client.post(reverse('codespeed.views.reports'), {})
 
         self.assertEqual(response.status_code, 405)
+
+
+class TestFeeds(TestCase):
+
+    def test_latest_result_feed(self):
+        response = self.client.get(reverse('latest-results'))
+
+        self.assertEqual(response.status_code, 200)
+        content = response.content.decode()
+        self.assertIn('<atom:link ', content)

codespeed/urls.py

@@ -9,9 +9,9 @@
     url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
     url(r'^about/$', TemplateView.as_view(template_name='about.html'), name='about'),
     # RSS for reports
-    url(r'^feeds/latest/$', LatestEntries(), name='latest_feeds'),
+    url(r'^feeds/latest/$', LatestEntries(), name='latest-results'),
     url(r'^feeds/latest_significant/$', LatestSignificantEntries(),
-        name='latest_significant_feeds'),
+        name='latest-significant-results'),
 )
 
 urlpatterns += patterns('codespeed.views',