NixOS/hydra
NixOS/hydra
1
0
Fork 0
mirror of https://github.com/NixOS/hydra.git synced 2024-10-18 17:02:28 -04:00
Code Activity

check for revisions

Browse source
This commit is contained in:
Rob Vermaas 2011-10-05 19:08:45 +00:00
parent 52c2b31711
commit 6d81bafae4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lib/Hydra/Controller/API.pm
View file

@ -207,15 +207,18 @@ sub scmdiff : Chained('api') PathPart('scmdiff') Args(0) {
my $uri = $c->request->params->{uri} ; my $uri = $c->request->params->{uri} ;
my $type = $c->request->params->{type} ; my $type = $c->request->params->{type} ;
my $branch = $c->request->params->{branch} ;
my $rev1 = $c->request->params->{rev1} ; my $rev1 = $c->request->params->{rev1} ;
my $rev2 = $c->request->params->{rev2} ; my $rev2 = $c->request->params->{rev2} ;
my $branch;
die("invalid revisions: [$rev1] [$rev2]") if $rev1 !~ m/^[a-zA-Z0-9_.]+$/ || $rev2 !~ m/^[a-zA-Z0-9_.]+$/ ;
my $diff = ""; my $diff = "";
if($type eq "hg") { if($type eq "hg") {
my $clonePath = scmPath . "/" . sha256_hex($uri); my $clonePath = scmPath . "/" . sha256_hex($uri);
die if ! -d $clonePath; die if ! -d $clonePath;
$diff .= `(cd $clonePath ; hg log -r $rev1 -r $rev2)`; $branch = `hg log --template '{branch}' -r $rev2`;
$diff .= `(cd $clonePath ; hg log -r $rev1 -r $rev2 -b $branch)`;
$diff .= `(cd $clonePath ; hg diff -r $rev1:$rev2)`; $diff .= `(cd $clonePath ; hg diff -r $rev1:$rev2)`;
} elsif ($type eq "git") { } elsif ($type eq "git") {
my $clonePath = scmPath . "/" . sha256_hex($uri.$branch); my $clonePath = scmPath . "/" . sha256_hex($uri.$branch);