grahamc/hydra - Change CQTN62OHT4DY35E2MJEG7GFTVNEE5KRDMV6ASBQLBHN7BUDK7WHAC

Die tabs die

Created by Eelco Dolstra on January 22, 2013

CQTN62OHT4DY35E2MJEG7GFTVNEE5KRDMV6ASBQLBHN7BUDK7WHAC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 96 [7.1]

B:BD[6.403] → [6.403:492]

	{finished => 1, buildstatus => 0}, {order_by => ["isCurrent DESC", "timestamp DESC"]});

[6.403]

[8.282]

        {finished => 1, buildstatus => 0}, {order_by => ["isCurrent DESC", "timestamp DESC"]});

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 111 [7.1]

B:BD[6.544] → [6.544:652]

	{finished => 1, buildstatus => 0, system => $system}, {order_by => ["isCurrent DESC", "timestamp DESC"]});

[6.544]

[8.918]

        {finished => 1, buildstatus => 0, system => $system}, {order_by => ["isCurrent DESC", "timestamp DESC"]});

Replacement in src/lib/Hydra/Controller/API.pm at line 106 [9.24]

B:BD[9.2633] → [9.2633:2701]

    	project => $jobset->project->name,
    	name => $jobset->name,

[9.2633]

[9.2701]

        project => $jobset->project->name,
        name => $jobset->name,

Replacement in src/lib/Hydra/Controller/API.pm at line 225 [9.24]

B:BD[6.2479] → [6.2479:2598]

	$diff .= `(cd $clonePath; hg log -r $rev1 -r $rev2 -b $branch)`;
	$diff .= `(cd $clonePath; hg diff -r $rev1:$rev2)`;

[6.2479]

[10.659]

        $diff .= `(cd $clonePath; hg log -r $rev1 -r $rev2 -b $branch)`;
        $diff .= `(cd $clonePath; hg diff -r $rev1:$rev2)`;

Replacement in src/lib/Hydra/Controller/API.pm at line 230 [9.24]

B:BD[10.788] → [6.2599:2702]

	$diff .= `(cd $clonePath; git log $rev1..$rev2)`;
	$diff .= `(cd $clonePath; git diff $rev1..$rev2)`;

[10.788]

[10.893]

        $diff .= `(cd $clonePath; git log $rev1..$rev2)`;
        $diff .= `(cd $clonePath; git diff $rev1..$rev2)`;

Replacement in src/lib/Hydra/Controller/Admin.pm at line 24 [12.1]

B:BD[11.149] → [11.149:568]

    	if($machine->enabled) {
	        $result = $result . $machine->username . '@'. $machine->hostname . ' ';
	        foreach my $system ($machine->buildmachinesystemtypes) {
	            $result = $result . $system->system .',';
	        }
	        chop $result;
	        $result = $result . ' '. $machine->ssh_key . ' ' . $machine->maxconcurrent . ' '. $machine->speedfactor . ' ' . $machine->options . "\n";
    	}

[11.149]

[11.568]

        if($machine->enabled) {
            $result = $result . $machine->username . '@'. $machine->hostname . ' ';
            foreach my $system ($machine->buildmachinesystemtypes) {
                $result = $result . $system->system .',';
            }
            chop $result;
            $result = $result . ' '. $machine->ssh_key . ' ' . $machine->maxconcurrent . ' '. $machine->speedfactor . ' ' . $machine->options . "\n";
        }

Replacement in src/lib/Hydra/Controller/Admin.pm at line 287 [12.1]

B:BD[11.3899] → [11.3899:3998]

B:BD[11.3998] → [13.342:349]

	    for my $s (@$systems) {
	        $machine->buildmachinesystemtypes->create({ system => $s}) ;
	    }

[11.3899]

[11.4012]

            for my $s (@$systems) {
                $machine->buildmachinesystemtypes->create({ system => $s}) ;
            }

Replacement in src/lib/Hydra/Controller/Build.pm at line 63 [14.1]
B:BD[6.3149] → [2.55:94]
```
	my $logtext = logContents($path, 50);
```
[6.3149]
[15.35]
```
        my $logtext = logContents($path, 50);
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 143 [14.1]

B:BD[16.44] → [16.44:123]

    	my $url = $c->request->uri->as_string;
    	$url =~ s/tail-reload/tail/g;

[16.44]

[16.123]

        my $url = $c->request->uri->as_string;
        $url =~ s/tail-reload/tail/g;

Replacement in src/lib/Hydra/Controller/Build.pm at line 314 [14.1]

B:BD[17.744] → [17.744:937]

    	my $buildStep;
    	($buildStep) = $c->model('DB::BuildSteps')->search({ outpath => $p }, {}) ;
    	my %dep = ( buildstep => $buildStep,  path => $p ) ;
    	push(@buildtimedeps, \%dep);

[17.744]

[17.937]

        my $buildStep;
        ($buildStep) = $c->model('DB::BuildSteps')->search({ outpath => $p }, {}) ;
        my %dep = ( buildstep => $buildStep,  path => $p ) ;
        push(@buildtimedeps, \%dep);

Replacement in src/lib/Hydra/Controller/Build.pm at line 321 [14.1]

B:BD[17.980] → [17.980:1171]

    	my $buildStep;
    	($buildStep) = $c->model('DB::BuildSteps')->search({ outpath => $p }, {}) ;
    	my %dep = ( buildstep => $buildStep,  path => $p ) ;
    	push(@runtimedeps, \%dep);

[17.980]

[17.1171]

        my $buildStep;
        ($buildStep) = $c->model('DB::BuildSteps')->search({ outpath => $p }, {}) ;
        my %dep = ( buildstep => $buildStep,  path => $p ) ;
        push(@runtimedeps, \%dep);

Replacement in src/lib/Hydra/Controller/Build.pm at line 469 [14.1]

B:BD[4.191] → [4.191:259]

	$c->request->params->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

[4.191]

[4.259]

        $c->request->params->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

Replacement in src/lib/Hydra/Controller/Job.pm at line 31 [19.46]

B:BD[18.770] → [18.770:826]

B:BD[18.826] → [20.182:268]

	[ $c->stash->{job}->builds->search({ finished => 1 }, 
	    { order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ];

[18.770]

[21.328]

        [ $c->stash->{job}->builds->search({ finished => 1 }, 
            { order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ];

Replacement in src/lib/Hydra/Controller/Job.pm at line 35 [19.46]

B:BD[22.1680] → [22.1680:1813]

	$c->stash->{job}->builds->search(
	    { busy => 1 }, 
	    { join => ['project']
	    , order_by => ["priority DESC", "timestamp"]

[22.1680]

[22.1813]

        $c->stash->{job}->builds->search(
            { busy => 1 }, 
            { join => ['project']
            , order_by => ["priority DESC", "timestamp"]

Replacement in src/lib/Hydra/Controller/Job.pm at line 40 [19.46]

B:BD[22.1860] → [22.1860:1904]

	    , '+as' => ['enabled']  
	    } 
	) ];

[22.1860]

[21.842]

            , '+as' => ['enabled']  
            } 
        ) ];

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 60 [24.104]
B:BD[23.229] → [23.229:267]
```
    	push(@systems, $system->system);
```
[23.229]
[23.267]
```
        push(@systems, $system->system);
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 77 [24.104]

B:BD[25.1753] → [25.1753:1858]

	          , select => \@select
	          , as => \@as
	          , order_by => ["job"]
	          })];

[25.1753]

[25.1858]

                  , select => \@select
                  , as => \@as
                  , order_by => ["job"]
                  })];

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 229 [24.104]

B:BD[4.475] → [4.475:543]

	$c->request->params->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

[4.475]

[4.543]

        $c->request->params->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 14 [26.1302]

B:BD[26.1618] → [26.1618:1673]

	or notFound($c, "Evaluation $evalId doesn't exist.");

[26.1618]

[26.1673]

        or notFound($c, "Evaluation $evalId doesn't exist.");

Replacement in src/lib/Hydra/Controller/Project.pm at line 150 [7.1245]

B:BD[4.564] → [4.564:632]

	$c->request->params->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

[4.564]

[27.1274]

        $c->request->params->{"nixexprpath"} =~ /.scm$/ ? "guile" : "nix";

Replacement in src/lib/Hydra/Controller/Root.pm at line 26 [29.804]

B:BD[28.54] → [22.2468:2668]

	$c->stash->{nrRunningBuilds} = $c->model('DB::Builds')->search({ finished => 0, busy => 1 }, {})->count();
	$c->stash->{nrQueuedBuilds} = $c->model('DB::Builds')->search({ finished => 0 })->count();

[28.54]

[30.368]

        $c->stash->{nrRunningBuilds} = $c->model('DB::Builds')->search({ finished => 0, busy => 1 }, {})->count();
        $c->stash->{nrQueuedBuilds} = $c->model('DB::Builds')->search({ finished => 0 })->count();

Replacement in src/lib/Hydra/Controller/Root.pm at line 205 [29.804]
B:BD[31.230] → [5.0:24]
```
	"WantMassQuery: 0\n" .
```
[31.230]
[5.24]
```
        "WantMassQuery: 0\n" .
```
Replacement in src/lib/Hydra/Controller/Root.pm at line 208 [29.804]
B:BD[5.157] → [5.157:176]
```
	"Priority: 100\n"
```
[5.157]
[31.252]
```
        "Priority: 100\n"
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 640 [34.2663]
∅:D[32.360] → [33.861:904]
B:BD[33.861] → [33.861:904]
```
	$input->{type} = $type if defined $input;
```
[32.360]
[33.904]
```
        $input->{type} = $type if defined $input;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 651 [34.2663]

B:BD[4.740] → [4.740:863]

    	if ($value eq "true") {
    	    $result = "#t";
    	} else {
    	    $result = "#f";
    	}
    	$result = $value;

[4.740]

[4.863]

        if ($value eq "true") {
            $result = "#t";
        } else {
            $result = "#f";
        }
        $result = $value;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 658 [34.2663]
B:BD[4.876] → [4.876:899]
```
    	$result = $value;
```
[4.876]
[4.899]
```
        $result = $value;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 667 [34.2663]

B:BD[4.1032] → [4.1032:1552]

	$result = "'((file-name . \"" . ${input}->{storePath} . "\")" .
	    (defined $input->{revision} ? "(revision . \"" . $input->{revision} . "\")" : "") .
	    (defined $input->{revCount} ? "(revision-count . " . $input->{revCount} . ")" : "") .
	    (defined $input->{gitTag} ? "(git-tag . \"" . $input->{gitTag} . "\")" : "") .
	    (defined $input->{shortRev} ? "(short-revision . \"" . $input->{shortRev} . "\")" : "") .
	    (defined $input->{version} ? "(version . \"" . $input->{version} . "\")" : "") .
	    ")";

[4.1032]

[4.1552]

        $result = "'((file-name . \"" . ${input}->{storePath} . "\")" .
            (defined $input->{revision} ? "(revision . \"" . $input->{revision} . "\")" : "") .
            (defined $input->{revCount} ? "(revision-count . " . $input->{revCount} . ")" : "") .
            (defined $input->{gitTag} ? "(git-tag . \"" . $input->{gitTag} . "\")" : "") .
            (defined $input->{shortRev} ? "(short-revision . \"" . $input->{shortRev} . "\")" : "") .
            (defined $input->{version} ? "(version . \"" . $input->{version} . "\")" : "") .
            ")";

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 675 [34.2663]

B:BD[4.1565] → [4.1565:2077]

	$result = "{ outPath = builtins.storePath " . $input->{storePath} . "" .
	    (defined $input->{revision} ? "; rev = \"" . $input->{revision} . "\"" : "") .
	    (defined $input->{revCount} ? "; revCount = " . $input->{revCount} . "" : "") .
	    (defined $input->{gitTag} ? "; gitTag = \"" . $input->{gitTag} . "\"" : "") .
	    (defined $input->{shortRev} ? "; shortRev = \"" . $input->{shortRev} . "\"" : "") .
	    (defined $input->{version} ? "; version = \"" . $input->{version} . "\"" : "") .
	    ";}";

[4.1565]

[4.2077]

        $result = "{ outPath = builtins.storePath " . $input->{storePath} . "" .
            (defined $input->{revision} ? "; rev = \"" . $input->{revision} . "\"" : "") .
            (defined $input->{revCount} ? "; revCount = " . $input->{revCount} . "" : "") .
            (defined $input->{gitTag} ? "; gitTag = \"" . $input->{gitTag} . "\"" : "") .
            (defined $input->{shortRev} ? "; shortRev = \"" . $input->{shortRev} . "\"" : "") .
            (defined $input->{version} ? "; version = \"" . $input->{version} . "\"" : "") .
            ";}";

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 901 [34.2663]

B:BD[35.57] → [35.57:255]

B:BD[35.255] → [32.479:577]

∅:D[32.577] → [35.354:391]

B:BD[35.354] → [35.354:391]

		# The "project" and "jobset" constraints are
		# semantically unnecessary (because they're implied by
		# the eval), but they give a factor 1000 speedup on
		# the Nixpkgs jobset with PostgreSQL.
		{ project => $project->name, jobset => $jobset->name, job => $job->name, outPath => $outPath },
		{ rows => 1, columns => ['id'] });

[35.57]

[36.663]

                # The "project" and "jobset" constraints are
                # semantically unnecessary (because they're implied by
                # the eval), but they give a factor 1000 speedup on
                # the Nixpkgs jobset with PostgreSQL.
                { project => $project->name, jobset => $jobset->name, job => $job->name, outPath => $outPath },
                { rows => 1, columns => ['id'] });

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 956 [34.2663]

B:BD[37.5872] → [36.1419:1504]

	    , priority => $priority
	    , busy => 0
	    , locker => ""
	    , %extraFlags

[37.5872]

            , priority => $priority
            , busy => 0
            , locker => ""
            , %extraFlags

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 1016 [34.2663]
B:BD[38.530] → [22.3069:3112]
```
	    $paths = $paths . " " . $bs->outpath;
```
[38.530]
[38.578]
```
            $paths = $paths . " " . $bs->outpath;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 1022 [34.2663]

B:BD[22.3137] → [22.3137:3183]

	    { finished => 0
	    , timestamp => time

[22.3137]

[38.913]

            { finished => 0
            , timestamp => time

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 1026 [34.2663]
B:BD[38.964] → [22.3184:3193]
```
	    });
```
[38.964]
[39.85]
```
            });
```

Replacement in src/lib/Hydra/Helper/Nix.pm at line 175 [41.436]

B:BD[40.800] → [22.3925:3991]

	, "+as" => ["nrscheduled", "nrfailed", "nrsucceeded", "nrtotal"]

[40.800]

[22.3991]

        , "+as" => ["nrscheduled", "nrfailed", "nrsucceeded", "nrtotal"]

Replacement in src/lib/Hydra/View/NixPkg.pm at line 16 [42.1]
B:BD[3.56] → [3.56:83]
```
	. " " . $c->uri_for('/');
```
[3.56]
[42.384]
```
        . " " . $c->uri_for('/');
```