Indentation

Dependencies

• [2] FM4O2L4M hydra: if evaluator sees cached build, also add the buildproducts
• [3] FXW2UR7F initial bzr support
• [4] SHYRGAWZ hydra: when no external url is given for diff's of git/hg input, revert to a diff done on a local available clone
• [5] SGNXIOI4 Hydra/32: Add option to force evaluation of a certain jobset via web interface (for admins only)
• [6] O25D52TA initial support for mercurial
• [7] JI26P3PC hydra: export addBuildProducts
• [8] UO67NQMR Change `fetchInputGit' to do `git clone -b BRANCH' instead of `git clone'.
• [9] QBQSQOSY hydra: moved getbuildlog
• [10] 5SHCWE7X * Prevent repeated evaluation of a jobset with the same inputs. This
• [11] OSVLMLCQ hydra: factored out build restart and
• [12] C7CXMZ66 hydra: do not perform git clone every time. in stead work on local clone and pull
• [13] CHQEG6WY Hydra/29: Added timeout to svn/git checkouts, job evaluation
• [14] OOQ2D3KC * Refactoring: move fetchInput out of hydra_scheduler into a separate
• [15] 3XTHEUMP * Implemented the clone feature.
• [16] A22P7HCO hydra: at evaluation, check if path is already built, and mark as built in stead of adding to the queue.
• [17] JZE7DC2F Whitespace

Change contents

• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 16
  [5.2785]→[4.1004:1152](∅→∅)
  − our @EXPORT = qw(fetchInput evalJobs checkBuild inputsToArgs captureStdoutStderr getReleaseName getBuildLog addBuildProducts restartBuild scmPath);
  [5.2785]

  [5.2815]
  + our @EXPORT = qw(

  + fetchInput evalJobs checkBuild inputsToArgs captureStdoutStderr

  + getReleaseName getBuildLog addBuildProducts restartBuild scmPath

  + );
• edit in src/lib/Hydra/Helper/AddBuilds.pm at line 21
  [5.2816]

  [5.32]
  +
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 326
  [5.424]→[5.424:456](∅→∅)
  − chdir $clonePath or die $!;
  [5.424]

  [5.116]
  + chdir $clonePath or die $!; # !!! urgh, shouldn't do a chdir
• edit in src/lib/Hydra/Helper/AddBuilds.pm at line 404
  [3.93]

  [3.93]
  +
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 701
  [2.169]→[2.169:567](∅→∅)
  − open LIST, "$outPath/nix-support/hydra-build-products" or die;

  − while (<LIST>) {

  − /^([\w\-]+)\s+([\w\-]+)\s+(\S+)(\s+(\S+))?$/ or next;

  − my $type = $1;

  − my $subtype = $2 eq "none" ? "" : $2;

  − my $path = $3;

  − my $defaultPath = $5;

  − next unless -e $path;
  [2.169]

  [2.567]
  + open LIST, "$outPath/nix-support/hydra-build-products" or die;

  + while (<LIST>) {

  + /^([\w\-]+)\s+([\w\-]+)\s+(\S+)(\s+(\S+))?$/ or next;

  + my $type = $1;

  + my $subtype = $2 eq "none" ? "" : $2;

  + my $path = $3;

  + my $defaultPath = $5;

  + next unless -e $path;
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 710
  [2.568]→[2.568:624](∅→∅)
  − my $fileSize, my $sha1, my $sha256;
  [2.568]

  [2.624]
  + my $fileSize, my $sha1, my $sha256;
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 712
  [2.625]→[2.625:680](∅→∅)
  − # !!! validate $path, $defaultPath
  [2.625]

  [5.3430]
  + # !!! validate $path, $defaultPath
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 714
  [5.3431]→[2.681:841](∅→∅)
  − if (-f $path) {

  − my $st = stat($path) or die "cannot stat $path: $!";

  − $fileSize = $st->size;
  [5.3431]

  [2.841]
  + if (-f $path) {

  + my $st = stat($path) or die "cannot stat $path: $!";

  + $fileSize = $st->size;
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 718
  [2.866]→[2.866:1247](∅→∅)
  − $sha1 = `nix-hash --flat --type sha1 $path`

  − or die "cannot hash $path: $?";;

  − chomp $sha1;

  −

  − $sha256 = `nix-hash --flat --type sha256 $path`

  − or die "cannot hash $path: $?";;

  − chomp $sha256;

  − }
  [2.866]

  [5.3431]
  + $sha1 = `nix-hash --flat --type sha1 $path`

  + or die "cannot hash $path: $?";;

  + chomp $sha1;

  +

  + $sha256 = `nix-hash --flat --type sha256 $path`

  + or die "cannot hash $path: $?";;

  + chomp $sha256;

  + }
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 727
  [5.3432]→[2.1248:1320](∅→∅)
  − my $name = $path eq $outPath ? "" : basename $path;
  [5.3432]

  [2.1320]
  + my $name = $path eq $outPath ? "" : basename $path;
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 729
  [2.1341]→[2.1341:1948](∅→∅)
  − $db->resultset('BuildProducts')->create(

  − { build => $build->id

  − , productnr => $productnr++

  − , type => $type

  − , subtype => $subtype

  − , path => $path

  − , filesize => $fileSize

  − , sha1hash => $sha1

  − , sha256hash => $sha256

  − , name => $name

  − , defaultpath => $defaultPath

  − });

  − }

  − close LIST;

  − }
  [2.1341]

  [2.1948]
  + $db->resultset('BuildProducts')->create(

  + { build => $build->id

  + , productnr => $productnr++

  + , type => $type

  + , subtype => $subtype

  + , path => $path

  + , filesize => $fileSize

  + , sha1hash => $sha1

  + , sha256hash => $sha256

  + , name => $name

  + , defaultpath => $defaultPath

  + });

  + }

  + close LIST;

  + }
• replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 745
  [2.1949]→[2.1949:2316](∅→∅)
  − else {

  − $db->resultset('BuildProducts')->create(

  − { build => $build->id

  − , productnr => $productnr++

  − , type => "nix-build"

  − , subtype => ""

  − , path => $outPath

  − , name => $build->nixname

  − });

  − }
  [2.1949]

  [2.2316]
  + else {

  + $db->resultset('BuildProducts')->create(

  + { build => $build->id

  + , productnr => $productnr++

  + , type => "nix-build"

  + , subtype => ""

  + , path => $outPath

  + , name => $build->nixname

  + });

  + }