grahamc/hydra - Change RWFCW6ZNIE24XTEQUK5Y37K42BQER7EDGSSD4GQNFTGO5V4TY72QC

In the jobset evals lists, show what inputs changed between consecutive evals

Created by Eelco Dolstra on April 15, 2012

RWFCW6ZNIE24XTEQUK5Y37K42BQER7EDGSSD4GQNFTGO5V4TY72QC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 52 [5.104]

B:BD[4.1] → [3.0:52]

    $c->stash->{evals} = getEvals($self, $c, 0, 6);

[4.1]

[6.4]

    $c->stash->{evals} = getEvals($self, $c, 0, 5);

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 330 [5.104]

B:BD[3.113] → [3.113:168]

    return [ $c->stash->{jobset}->jobsetevals->search(

[3.113]

[3.168]

    
    my @evals = $c->stash->{jobset}->jobsetevals->search(

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 341 [5.104]
B:BD[3.896] → [3.896:920]
```
        , rows => $rows
```
[3.896]
[3.920]
```
        , rows => $rows + 1
```

Insertion in src/lib/Hydra/Controller/Jobset.pm at line 343 [5.104]

[3.948]

        });
    my @res = ();
    my $curInputs;
    for (my $n = 0; $n < $rows && $n < scalar @evals; $n++) {
        my $cur = $evals[$n];
        my $prev = $evals[$n + 1];
        # Compute what inputs changed between each eval.
        my $diff = 0;
        my $prevInputs = [];
        $curInputs = [ $cur->jobsetevalinputs->search(
            { uri => { '!=' => undef }, revision => { '!=' => undef }, altNr => 0 },
            { order_by => "name" }) ] unless defined $curInputs;
        if (defined $prev) {
            $diff = $cur->get_column("nrSucceeded") - $prev->get_column("nrSucceeded");
            $prevInputs = [ $prev->jobsetevalinputs->search(
                { uri => { '!=' => undef }, revision => { '!=' => undef }, altNr => 0 },
                { order_by => "name" }) ];

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 363 [5.104]

B:BD[3.958] → [3.958:967]

    ) ];

[3.958]

[7.1560]

        my @changedInputs;
        my %prevInputsHash;
        $prevInputsHash{$_->name} = $_ foreach @{$prevInputs};
        foreach my $input (@{$curInputs}) {
            my $p = $prevInputsHash{$input->name};
            push @changedInputs, $input
                if !defined $p || $input->revision != $p->revision || $input->type != $p->type || $input->uri != $p->uri;
        }
        $curInputs = $prevInputs;
        
        push @res, { eval => $cur, diff => $diff, changedInputs => [ @changedInputs ] };
    }
    
    return [@res];

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 393 [5.104]

B:BD[8.436] → [3.968:1065]

    $c->stash->{evals} = getEvals($self, $c, ($page - 1) * $resultsPerPage, $resultsPerPage + 1)

[8.436]

[8.1296]

    $c->stash->{evals} = getEvals($self, $c, ($page - 1) * $resultsPerPage, $resultsPerPage)

Insertion in src/root/common.tt at line 405 [9.2803]

[4.840]

[% BLOCK renderShortRev -%]
  [%- IF type == "svn" || type == "svn-checkout" || type == "bzr" || type == "bzr-checkout" -%]
    r[%- revision -%]
  [%- ELSIF type == "git" -%]
    <tt>[% revision.substr(0, 7) %]</tt>
  [%- ELSE -%]
    <tt>[%- revision -%]</tt>
  [%- END -%]
[%- END %]

Deletion in src/root/common.tt at line 417 [9.2803]
B:BD[4.864] → [4.864:865]
Insertion in src/root/common.tt at line 422 [9.2803]
[4.985]
[4.985]
```
      <th>Input changes</th>
```

Replacement in src/root/common.tt at line 427 [9.2803]

B:BD[4.1051] → [2.0:181]

    [% last = nrShown - 1; FOREACH n IN [0..last]; eval = evals.$n; m = n + 1; next = evals.$m;
       link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]

[4.1051]

[2.181]

    [%- FOREACH e IN evals; eval = e.eval; 
        link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) -%]

Insertion in src/root/common.tt at line 432 [9.2803]

[4.1362]

       <td>
         [%- IF e.changedInputs.size > 0 -%]
           [%- sep=''; FOREACH input IN e.changedInputs -%]
             [%- sep %] [% input.name %] → [% INCLUDE renderShortRev type=input.type revision=input.revision %]
           [%- sep=','; END -%]
         [%- ELSE -%]
           -
         [%- END -%]
       </td>

Replacement in src/root/common.tt at line 449 [9.2803]

B:BD[4.1790] → [4.1790:2112]

	 [% diff = eval.get_column('nrSucceeded') - next.get_column('nrSucceeded');
	    IF diff > 0 %]
	    <span class='label label-success'><strong>+[% diff %]</strong></span>
	 [% ELSIF diff < 0 && eval.get_column('nrScheduled') == 0 %]
	    <span class='label label-important'><strong>[% diff %]</strong></span>
	 [% END %]

[4.1790]

[4.2112]

	 [%- IF e.diff > 0 -%]
	    <span class='label label-success'><strong>+[% e.diff %]</strong></span>
	 [%- ELSIF e.diff < 0 && eval.get_column('nrScheduled') == 0 -%]
	    <span class='label label-important'><strong>[% e.diff %]</strong></span>
	 [%- END -%]

Replacement in src/root/common.tt at line 458 [9.2803]

B:BD[10.41] → [10.41:141]

      <tr><td class="centered" colspan="4"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>

[10.41]

[10.141]

      <tr><td class="centered" colspan=54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>

Deletion in src/root/common.tt at line 462 [9.2803]
∅:D[4.2170] → [11.2630:2632]
∅:D[8.4842] → [11.2630:2632]
B:BD[11.2630] → [11.2630:2632]
Deletion in src/root/jobset-evals.tt at line 8 [8.6334]
B:BD[12.1994] → [12.1994:2068]
∅:D[12.2068] → [8.6628:6631]
B:BD[8.6628] → [8.6628:6631]
```
[% nrShown = evals.size > resultsPerPage ? resultsPerPage : evals.size %]
  
```

Replacement in src/root/jobset-evals.tt at line 9 [8.6334]

B:BD[8.6697] → [12.2069:2134]

(page - 1) * resultsPerPage + nrShown %] out of [% total %].</p>

[8.6697]

[8.6765]

(page - 1) * resultsPerPage + evals.size %] out of [% total %].</p>

Replacement in src/root/jobset.tt at line 86 [14.8409]

B:BD[13.158] → [3.1105:1262]

	            [% INCLUDE renderEvals nrShown=evals.size() - 1 linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]

[13.158]

[13.413]

	            [% INCLUDE renderEvals linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]