grahamc/hydra - Change PGSSRA7CPOQI354Y6YJTYRFF57YJARB5THFE3MBJBVHOLYNEIGTQC

Add an input type "nix" for passing arbitrary Nix expressions

Created by Eelco Dolstra on September 30, 2013

PGSSRA7CPOQI354Y6YJTYRFF57YJARB5THFE3MBJBVHOLYNEIGTQC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/lib/Hydra/Controller/Root.pm at line 36 [5.804]
[4.399]
[4.399]
```
        'nix' => 'Nix expression',
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 160 [7.2663]
∅:D[6.311] → [7.10019:10051]
∅:D[8.2703] → [7.10019:10051]
B:BD[7.10019] → [7.10019:10051]
```
    elsif ($type eq "string") {
```
[9.2597]
[7.10051]
```
    elsif ($type eq "string" || $type eq "nix") {
```

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 244 [7.2663]

[10.1790]

[4.1475]

                when ("nix") {
                    push @res, "--arg", $input, $alt->{value};
                }

Replacement in src/root/common.tt at line 250 [12.2803]

B:BD[11.5421] → [11.5421:5518]

  [% ELSIF input.type == "string" || input.type == "boolean" %]
    <tt>"[% input.value %]"</tt>

[11.5421]

[11.5518]

  [% ELSIF input.type == "string" %]
    <tt>"[% HTML.escape(input.value) %]"</tt>
  [% ELSIF input.type == "nix" || input.type == "boolean" %]
    <tt>[% HTML.escape(input.value) %]</tt>

Replacement in src/root/common.tt at line 255 [12.2803]

B:BD[11.5531] → [11.5531:5616]

    <tt>[% input.uri %][% IF input.revision %] (r[% input.revision %])[% END %]</tt>

[11.5531]

[13.21438]

    <tt>[% HTML.escape(input.uri) %][% IF input.revision %] (r[% HTML.escape(input.revision) %])[% END %]</tt>

Replacement in src/root/common.tt at line 297 [12.2803]

B:BD[2.905] → [2.905:1022]

            [% ELSIF input.type == "string" || input.type == "boolean" %]
              <tt>"[% input.value %]"</tt>

[2.905]

[2.1022]

            [% ELSIF input.type == "string"  %]
              <tt>"[% HTML.escape(input.value) %]"</tt>
            [% ELSIF input.type == "nix" || input.type == "boolean" %]
              <tt>[% HTML.escape(input.value) %]</tt>

Replacement in src/root/common.tt at line 302 [12.2803]

B:BD[2.1045] → [2.1045:1084]

              <tt>[% input.uri %]</tt>

[2.1045]

[2.1084]

              <tt>[% HTML.escape(input.uri) %]</tt>

Replacement in src/root/common.tt at line 305 [12.2803]

B:BD[2.1122] → [2.1122:1194]

          <td>[% IF input.revision %][% input.revision %][% END %]</td>

[2.1122]

[2.1194]

          <td>[% IF input.revision %][% HTML.escape(input.revision) %][% END %]</td>

Replacement in src/root/reproduce.tt at line 144 [3.527]

B:BD[3.2690] → [3.2690:2745]

args+=(--arg '[% input.name %]' '"[% input.value %]"')

[3.2690]

[3.2745]

args+=(--arg '[% input.name %]' '"[% input.value %]"') # FIXME: escape

Insertion in src/root/reproduce.tt at line 149 [3.527]

[3.2836]

[% ELSIF input.type == "nix" %]
args+=(--arg '[% input.name %]' '[% input.value %]') # FIXME: escape

Replacement in src/sql/hydra.sql at line 79 [16.1]

B:BD[14.5858] → [15.286:364]

    type          text not null, -- "svn", "path", "uri", "string", "boolean"

[14.5858]

[14.5943]

    type          text not null, -- "svn", "path", "uri", "string", "boolean", "nix"