Include the project and jobset names in the configuration blocks

Dependencies

• [2] 34SOPSVF Allow to configure the timeout value for the GitInput plugin in different places.
• [3] JAH3UPWA Support revision control systems via plugins
• [4] 7EGUBBRQ Lock paths in the scm cache

Change contents

• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 52
  [2.705]→[2.705:752](∅→∅)
  − =item _pluginConfig($main_config, $input_name)
  [2.705]

  [2.752]
  + =item _pluginConfig($main_config, $project_name, $jobset_name, $input_name)
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 65
  [2.1160]→[2.1160:1308](∅→∅)
  − <git-input>

  − # general timeout

  − timeout = 400

  − <input-name>

  − # specific timeout for a particular input name

  − timeout = 400

  − </input-name>
  [2.1160]

  [2.1308]
  + Expected configuration format in the hydra config file:

  + <git-input>

  + # general timeout

  + timeout = 400

  +

  + <project:jobset:input-name>

  + # specific timeout for a particular input

  + timeout = 400

  + </project:jobset:input-name>
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 75
  [2.1309]→[2.1309:1483](∅→∅)
  − # use quotes when the input name has spaces

  − <"foot with spaces">

  − # specific timeout for a particular input name

  − timeout = 400

  − </"foo with spaces">

  − </git-input>
  [2.1309]

  [2.1483]
  + </git-input>
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 78
  [2.1508]→[2.1508:1549](∅→∅)
  − my ($main_config, $input_name) = @_;
  [2.1508]

  [2.1549]
  + my ($main_config, $project_name, $jobset_name, $input_name) = @_;
• edit in src/lib/Hydra/Plugin/GitInput.pm at line 84
  [2.1667]

  [2.1667]
  + my $input_block = "$project_name:$jobset_name:$input_name";

  +
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 91
  [2.1846]→[2.1846:1902](∅→∅)
  − _printIfDebug "Parsing plugin configuration: ";
  [2.1846]

  [2.1902]
  + _printIfDebug "Parsing plugin configuration:\n";
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 94
  [2.1944]→[2.1944:2163](∅→∅)
  − if (defined $cfg->{$input_name} and %{$cfg->{$input_name}}) {

  − _printIfDebug "Merging sections for $input_name\n";

  − $cfg = {%{$cfg}, %{$cfg->{$input_name}}}; # merge with precedense to the input name
  [2.1944]

  [2.2163]
  + if (defined $cfg->{$input_block} and %{$cfg->{$input_block}}) {

  + _printIfDebug "Merging sections from $input_block\n";

  + # merge with precedense to the input block

  + $cfg = {%{$cfg}, %{$cfg->{$input_block}}};
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 101
  [2.2254]→[2.2254:2317](∅→∅)
  − _printIfDebug "Using custom timeout for $input_name:";
  [2.2254]

  [2.2317]
  + _printIfDebug "Using custom timeout for $input_block:\n";
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 103
  [2.2330]→[2.2330:2394](∅→∅)
  − _printIfDebug "Using default timeout for $input_name:";
  [2.2330]

  [2.2394]
  + _printIfDebug "Using default timeout for $input_block:\n";
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 110
  [3.237]→[3.237:280](∅→∅)
  − my ($self, $type, $name, $value) = @_;
  [3.237]

  [3.280]
  + my ($self, $type, $name, $value, $project, $jobset) = @_;
• replacement in src/lib/Hydra/Plugin/GitInput.pm at line 115
  [2.2531]→[2.2531:2585](∅→∅)
  − my $cfg = _pluginConfig($self->{config}, $name);

  −
  [2.2531]

  [2.2585]
  + my $cfg = _pluginConfig($self->{config},

  + $project->get_column('name'),

  + $jobset->get_column('name'),

  + $name);