grahamc/hydra - Change EDRUQ4UK643SUCYMMTS2JS4N3BHARLKRDWRH3QAYWDMWRAMPNAOQC

Die TABs die

Created by Eelco Dolstra on December 4, 2011

EDRUQ4UK643SUCYMMTS2JS4N3BHARLKRDWRH3QAYWDMWRAMPNAOQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 50 [8.2663]
B:BD[7.120] → [7.120:143]
```
	my ($outPath) = @_;
	
```
[7.120]
[7.143]
```
    my ($outPath) = @_;
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 176 [8.2663]

B:BD[3.145] → [3.145:477]

	# First figure out the last-modified revision of the URI.
	my @cmd = (["svn", "ls", "-v", "--depth", "empty", $uri],
		   "|", ["sed", 's/^ *\([0-9]*\).*/\1/']);
	die "Cannot get head revision of Subversion repository at `$uri':\n$stderr"
	    unless IPC::Run::run(@cmd, \$stdout, \$stderr);
	$revision = $stdout; chomp $revision;

[3.145]

[3.477]

        # First figure out the last-modified revision of the URI.
        my @cmd = (["svn", "ls", "-v", "--depth", "empty", $uri],
                   "|", ["sed", 's/^ *\([0-9]*\).*/\1/']);
        die "Cannot get head revision of Subversion repository at `$uri':\n$stderr"
            unless IPC::Run::run(@cmd, \$stdout, \$stderr);
        $revision = $stdout; chomp $revision;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 197 [8.2663]

B:BD[6.192] → [6.192:381]

	# No, do a checkout.  The working copy is reused between
	# invocations to speed things up.
	mkpath(scmPath . "/svn");
	my $wcPath = scmPath . "/svn" . sha256_hex($uri) . "/svn-checkout";

[6.192]

[6.381]

        # No, do a checkout.  The working copy is reused between
        # invocations to speed things up.
        mkpath(scmPath . "/svn");
        my $wcPath = scmPath . "/svn" . sha256_hex($uri) . "/svn-checkout";

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 207 [8.2663]

B:BD[6.561] → [6.561:1034]

	if ($checkout) {
	    $storePath = addToStore($wcPath, 1, "sha256");
	} else {
	    # Hm, if the Nix Perl bindings supported filters in
	    # addToStore(), then we wouldn't need to make a copy here.
	    my $tmpDir = File::Temp->newdir("hydra-svn-export.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die;
	    (system "svn", "export", $wcPath, "$tmpDir/svn-export", "--quiet") == 0 or die "svn export failed";
	    $storePath = addToStore("$tmpDir/svn-export", 1, "sha256");
	}

[6.561]

[8.8133]

        if ($checkout) {
            $storePath = addToStore($wcPath, 1, "sha256");
        } else {
            # Hm, if the Nix Perl bindings supported filters in
            # addToStore(), then we wouldn't need to make a copy here.
            my $tmpDir = File::Temp->newdir("hydra-svn-export.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die;
            (system "svn", "export", $wcPath, "$tmpDir/svn-export", "--quiet") == 0 or die "svn export failed";
            $storePath = addToStore("$tmpDir/svn-export", 1, "sha256");
        }

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 354 [8.2663]

B:BD[2.25] → [2.25:237]

	# This is a TopGit branch.  Fetch all the topic branches so
	# that builders can run "tg patch" and similar.
	(my $res, $stdout, $stderr) = captureStdoutStderr(600,
	  ("tg", "remote", "--populate", "origin"));

[2.25]

[2.237]

        # This is a TopGit branch.  Fetch all the topic branches so
        # that builders can run "tg patch" and similar.
        (my $res, $stdout, $stderr) = captureStdoutStderr(600,
          ("tg", "remote", "--populate", "origin"));

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 359 [8.2663]

B:BD[2.238] → [2.238:323]

	print STDERR "Warning: `tg remote --populate origin' failed:\n$stderr" unless $res;

[2.238]

[2.323]

        print STDERR "Warning: `tg remote --populate origin' failed:\n$stderr" unless $res;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 658 [8.2663]

B:BD[4.22] → [4.22:116]

	die unless $@ eq "timeout\n";   # propagate unexpected errors
	return (undef, undef, undef);

[4.22]

[4.116]

        die unless $@ eq "timeout\n";   # propagate unexpected errors
        return (undef, undef, undef);

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 661 [8.2663]
B:BD[4.129] → [4.129:163]
```
	return ($res, $stdout, $stderr);
```
[4.129]
[4.163]
```
        return ($res, $stdout, $stderr);
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 714 [8.2663]

B:BD[9.169] → [5.230:508]

	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;

[9.169]

[9.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 723 [8.2663]
B:BD[9.568] → [5.509:550]
```
	    my $fileSize, my $sha1, my $sha256;
```
[9.568]
[9.624]
```
            my $fileSize, my $sha1, my $sha256;
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 725 [8.2663]
B:BD[9.625] → [5.551:591]
```
	    # !!! validate $path, $defaultPath
```
[9.625]
[10.3430]
```
            # !!! validate $path, $defaultPath
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 727 [8.2663]

B:BD[10.3431] → [5.592:693]

	    if (-f $path) {
		my $st = stat($path) or die "cannot stat $path: $!";
		$fileSize = $st->size;

[10.3431]

[9.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 731 [8.2663]

B:BD[9.866] → [5.694:910]

		$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;
	    }

[9.866]

[10.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 740 [8.2663]

B:BD[10.3432] → [5.911:968]

	    my $name = $path eq $outPath ? "" : basename $path;

[10.3432]

[9.1320]

            my $name = $path eq $outPath ? "" : basename $path;

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 742 [8.2663]

B:BD[9.1341] → [5.969:1275]

	    $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;

[9.1341]

[5.1275]

            $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 759 [8.2663]

B:BD[5.1293] → [5.1293:1507]

	$db->resultset('BuildProducts')->create(
	    { build => $build->id
	    , productnr => $productnr++
	    , type => "nix-build"
	    , subtype => ""
	    , path => $outPath
	    , name => $build->nixname
	    });

[5.1293]

[5.1507]

        $db->resultset('BuildProducts')->create(
            { build => $build->id
            , productnr => $productnr++
            , type => "nix-build"
            , subtype => ""
            , path => $outPath
            , name => $build->nixname
            });

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 840 [8.2663]

B:BD[7.580] → [7.580:624]

        	$build->update({ finished => 1 });

[7.580]

[7.624]

                $build->update({ finished => 1 });