Merge branch 'master' into build-ng

src/lib/Hydra/Controller/Jobset.pm

@@ -163,7 +163,7 @@ sub edit : Chained('jobsetChain') PathPart Args(0) {
 
     $c->stash->{template} = 'edit-jobset.tt';
     $c->stash->{edit} = 1;
-    $c->stash->{clone} = defined $c->stash->{params}->{clone};
+    $c->stash->{cloneJobset} = defined $c->stash->{params}->{cloneJobset};
     $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
 }
 
@@ -269,7 +269,7 @@ sub clone : Chained('jobsetChain') PathPart('clone') Args(0) {
     requireProjectOwner($c, $c->stash->{project});
 
     $c->stash->{template} = 'edit-jobset.tt';
-    $c->stash->{clone} = 1;
+    $c->stash->{cloneJobset} = 1;
     $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
 }
 

src/lib/Hydra/Controller/JobsetEval.pm

@@ -157,6 +157,17 @@ sub release : Chained('eval') PathPart('release') Args(0) {
 }
 
 
+sub create_jobset : Chained('eval') PathPart('create-jobset') Args(0) {
+    my ($self, $c) = @_;
+    my $eval = $c->stash->{eval};
+
+    requireProjectOwner($c, $c->stash->{project});
+
+    $c->stash->{template} = 'edit-jobset.tt';
+    $c->stash->{createFromEval} = 1;
+}
+
+
 sub cancel : Chained('eval') PathPart('cancel') Args(0) {
     my ($self, $c) = @_;
     requireProjectOwner($c, $c->stash->{eval}->project);

src/lib/Hydra/Controller/Project.pm

@@ -113,7 +113,6 @@ sub create : Path('/create-project') {
 
     $c->stash->{template} = 'edit-project.tt';
     $c->stash->{create} = 1;
-    $c->stash->{edit} = 1;
 }
 
 
@@ -124,7 +123,6 @@ sub create_jobset : Chained('projectChain') PathPart('create-jobset') Args(0) {
 
     $c->stash->{template} = 'edit-jobset.tt';
     $c->stash->{create} = 1;
-    $c->stash->{edit} = 1;
     $c->stash->{totalShares} = getTotalShares($c->model('DB')->schema);
 }
 

src/lib/Hydra/Plugin/GitInput.pm

@@ -13,6 +13,11 @@ sub supportedInputTypes {
     $inputTypes->{'git'} = 'Git checkout';
 }
 
+sub _isHash {
+    my ($rev) = @_;
+    return length($rev) == 40 && $rev =~ /^[0-9a-f]+$/;
+}
+
 # Clone or update a branch of a repository into our SCM cache.
 sub _cloneRepo {
     my ($self, $uri, $branch, $deepClone) = @_;
@@ -24,15 +29,16 @@ sub _cloneRepo {
     my $res;
     if (! -d $clonePath) {
         # Clone everything and fetch the branch.
-        # TODO: Optimize the first clone by using "git init $clonePath" and "git remote add origin $uri".
-        $res = run(cmd => ["git", "clone", "--branch", $branch, $uri, $clonePath], timeout => 600);
-        die "error cloning git repo at `$uri':\n$res->{stderr}" if $res->{status};
+        $res = run(cmd => ["git", "init", $clonePath]);
+        $res = run(cmd => ["git", "remote", "add", "origin", "--", $uri], dir => $clonePath) unless $res->{status};
+        die "error creating git repo in `$clonePath':\n$res->{stderr}" if $res->{status};
     }
 
     # This command forces the update of the local branch to be in the same as
     # the remote branch for whatever the repository state is.  This command mirrors
     # only one branch of the remote repository.
-    $res = run(cmd => ["git", "fetch", "-fu", "origin", "+$branch:$branch"], dir => $clonePath, timeout => 600);
+    my $localBranch = _isHash($branch) ? "_hydra_tmp" : $branch;
+    $res = run(cmd => ["git", "fetch", "-fu", "origin", "+$branch:$localBranch"], dir => $clonePath, timeout => 600);
     $res = run(cmd => ["git", "fetch", "-fu", "origin"], dir => $clonePath, timeout => 600) if $res->{status};
     die "error fetching latest change from git repo at `$uri':\n$res->{stderr}" if $res->{status};
 
@@ -78,7 +84,8 @@ sub fetchInput {
     my $sha256;
     my $storePath;
 
-    my $revision = grab(cmd => ["git", "rev-parse", "$branch"], dir => $clonePath, chomp => 1);
+    my $revision = _isHash($branch) ? $branch
+        : grab(cmd => ["git", "rev-parse", "$branch"], dir => $clonePath, chomp => 1);
     die "did not get a well-formated revision number of Git branch '$branch' at `$uri'"
         unless $revision =~ /^[0-9a-fA-F]+$/;
 
@@ -104,8 +111,7 @@ sub fetchInput {
         if (defined $deepClone) {
             # Checked out code often wants to be able to run `git
             # describe', e.g., code that uses Gnulib's `git-version-gen'
-            # script.  Thus, we leave `.git' in there.  Same for
-            # Subversion (e.g., libgcrypt's build system uses that.)
+            # script.  Thus, we leave `.git' in there.
             $ENV{"NIX_PREFETCH_GIT_LEAVE_DOT_GIT"} = "1";
 
             # Ask for a "deep clone" to allow "git describe" and similar
@@ -115,6 +121,7 @@ sub fetchInput {
             $ENV{"NIX_PREFETCH_GIT_DEEP_CLONE"} = "1";
         }
 
+        # FIXME: Don't use nix-prefetch-git.
         ($sha256, $storePath) = split ' ', grab(cmd => ["nix-prefetch-git", $clonePath, $revision], chomp => 1);
 
         txn_do($self->{db}, sub {