From owner-svn-src-user@FreeBSD.ORG  Fri Oct 11 08:53:27 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F1A47238;
 Fri, 11 Oct 2013 08:53:27 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C459E21F5;
 Fri, 11 Oct 2013 08:53:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9B8rRJ2032528;
 Fri, 11 Oct 2013 08:53:27 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9B8rRNL032526;
 Fri, 11 Oct 2013 08:53:27 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201310110853.r9B8rRNL032526@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 11 Oct 2013 08:53:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256311 - user/des/tinderbox/www
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Oct 2013 08:53:28 -0000

Author: des
Date: Fri Oct 11 08:53:27 2013
New Revision: 256311
URL: http://svnweb.freebsd.org/changeset/base/256311

Log:
  Restructure the outer and inner loop so results are sorted first
  numerically by branch rank, then alphabetically by variant.

Modified:
  user/des/tinderbox/www/index.cgi

Modified: user/des/tinderbox/www/index.cgi
==============================================================================
--- user/des/tinderbox/www/index.cgi	Fri Oct 11 07:22:26 2013	(r256310)
+++ user/des/tinderbox/www/index.cgi	Fri Oct 11 08:53:27 2013	(r256311)
@@ -32,7 +32,7 @@ use strict;
 use POSIX qw(strftime);
 use Sys::Hostname;
 
-my %CONFIGS;
+my %BRANCHES;
 my %ARCHES;
 
 my $DIR = ".";
@@ -79,13 +79,14 @@ sub inverse_branch_sort($$) {
     return branch_rank($b) cmp branch_rank($a);
 }
 
-sub do_config($) {
-    my ($config) = @_;
+sub do_branch($) {
+    my ($branch) = @_;
 
-    my %branches = %{$CONFIGS{$config}};
+    my $prettybranch = $branch;
+    $prettybranch =~ s@^HEAD$@head@;
+    $prettybranch =~ s@^RELENG_(\d+)_(\d+)$@releng/$1.$2@;
+    $prettybranch =~ s@^RELENG_(\d+)$@stable/$1@;
 
-    $config =~ m/^(\w+)((?:-\w+)*?)(-build)?$/;
-    my $variant = join(' ', split('-', $2));
     print "      <tr class='header'>
         <th>&nbsp;</th>
 ";
@@ -102,13 +103,11 @@ sub do_config($) {
 
     my $now = time();
 
-    foreach my $branch (sort(inverse_branch_sort keys(%branches))) {
-	my $prettybranch = $branch;
-	$prettybranch =~ s@^HEAD$@/head@;
-	$prettybranch =~ s@^RELENG_(\d+)_(\d+)$@/releng/$1.$2@;
-	$prettybranch =~ s@^RELENG_(\d+)$@/stable/$1@;
+    foreach my $config (sort(keys(%{$BRANCHES{$branch}}))) {
+	$config =~ m/^(\w+)((?:-\w+)*?)(-build)?$/;
+	my $variant = $2 =~ s/^-//r;
 	print "      <tr>
-	<th>$prettybranch$variant</th>
+	<th>$prettybranch" . ($variant ? "<br/>($variant)" : "") . "</th>
 ";
 	foreach my $arch (sort(keys(%ARCHES))) {
 	    foreach my $machine (sort(keys(%{$ARCHES{$arch}}))) {
@@ -164,7 +163,7 @@ MAIN:{
 	or die("$DIR: $!\n");
     foreach (readdir(DIR)) {
 	next unless m/^tinderbox-([\w-]+)-(\w+)-(\w+)-(\w+)\.(brief|full)$/;
-	$CONFIGS{$1}->{$2} = $ARCHES{$3}->{$4} = 1;
+	$BRANCHES{$2}->{$1} = $ARCHES{$3}->{$4} = 1;
     }
     closedir(DIR);
 
@@ -197,9 +196,8 @@ MAIN:{
     }
 
     # Generate rows
-    foreach my $config (sort(inverse_branch_sort keys(%CONFIGS))) {
-	next if $config =~ m/^update_/;
-	do_config($config);
+    foreach my $branch (sort(inverse_branch_sort keys(%BRANCHES))) {
+	do_branch($branch);
     }
 
     print "