Skip to content

Commit 9f75a70

Browse files
committed
Don't choose a revision that doesn't have results for pypy-c-jit
1 parent 148f927 commit 9f75a70

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

codespeed/views.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def comparison(request):
308308
pass # The selected baseline was not checked
309309
except:
310310
pass # Keep "none" as default baseline
311-
print selectedbaseline
311+
312312
selecteddirection = False
313313
if 'hor' in data and data['hor'] == "true" or\
314314
hasattr(settings, 'CHART_ORIENTATION') and settings.CHART_ORIENTATION == 'horizontal':
@@ -940,21 +940,32 @@ def get_home_data(request):
940940
branch__project=cp_exe.project).order_by('-date')[0]
941941
cp_results = Result.objects.filter(
942942
executable=cp_exe, revision=cp_lastrev, environment=env)
943-
# Fetch PyPy trunk data
943+
944944
pp_exe = Executable.objects.get(name="pypy-c-jit")
945945
pp_branch = Branch.objects.get(name="default", project=pp_exe.project)
946-
pp_lastrev = Revision.objects.filter(branch=pp_branch).order_by('-date')[0]
947-
pp_results = Result.objects.filter(
948-
executable=pp_exe, revision=pp_lastrev, environment=env)
949946
# Fetch PyPy tagged revisions
950947
pp_taggedrevs = Revision.objects.filter(
951948
project=pp_exe.project
952949
).exclude(tag="").order_by('date')
953950
data['tagged_revs'] = [rev.tag for rev in pp_taggedrevs]
954-
pp_results = {'PyPy trunk': pp_results}
951+
pp_results = {}
955952
for rev in pp_taggedrevs:
956953
pp_results[rev.tag] = Result.objects.filter(
957954
executable=pp_exe, revision=rev, environment=env)
955+
956+
# Fetch PyPy trunk data
957+
revs = Revision.objects.filter(branch=pp_branch).order_by('-date')[:5]
958+
pp_lastrev = None
959+
for i in range(4):
960+
pp_lastrev = revs[i]
961+
if pp_lastrev.results.filter(executable=pp_exe):
962+
break
963+
pp_lastrev = None
964+
if pp_lastrev is None:
965+
return HttpResponse(json.dumps( data ))
966+
pp_results['PyPy trunk'] = Result.objects.filter(
967+
executable=pp_exe, revision=pp_lastrev, environment=env)
968+
958969
# Save data
959970
benchmarks = []
960971
for res in cp_results:

0 commit comments

Comments
 (0)