X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=5599061de2a68cb8e997c66f2d81e48c489688a9;hp=ed27c0eaec78efad42b45e079b69a6582c77fba1;hb=5408b0c227d942af55442389894a9ed7338a55ce;hpb=16f71298e0a7736a3833e44e4a9ebb356f919dc6

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index ed27c0ea..5599061d 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -222,6 +222,17 @@ sub movetogarbage () {
 	or die "rename repo $realdestrepo to $garbagerepo: $!";
 }
 
+sub onwardpush () {
+    my @cmd = (qw(git send-pack), $destrepo);
+    push @cmd, qw(--force) if $policy & NOFFCHECK;
+    push @cmd, "$commit:refs/dgit/$suite",
+	       "$tagval:refs/tags/$tagname");
+    debugcmd @cmd;
+    $!=0;
+    my $r = system @cmd;
+    !$r or die "onward push to $destrepo failed: $r $!";
+}
+
 #----- git-receive-pack -----
 
 sub fixmissing__git_receive_pack () {
@@ -236,6 +247,7 @@ sub makeworkingclone () {
     $workrepo = "$dgitrepos/_tmp/${package}_incoming$$";
     acquiretree($workrepo, 1);
     runcmd qw(git clone -l -q --mirror), $destrepo, $workrepo;
+    rmtree "${workrepo}_fresh";
 }
 
 sub setupstunthook () {
@@ -253,6 +265,15 @@ END
     debug " stunt hook set up $prerecv";
 }
 
+sub dealwithfreshrepo () {
+    my $freshrepo = "${workrepo}_fresh";
+    if (!stat $freshrepo) {
+	$!==ENOENT or die "$freshrepo $!";
+	return;
+    }
+    $destrepo = $freshrepo;
+}
+
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 
@@ -292,6 +313,8 @@ sub maybeinstallprospective () {
     die Dumper(\%got)." -- missing refs in new repo"
 	if grep { !$_ } values %got;
 
+    movetogarbage; # in case of FRESHREPO
+
     debug "install $destrepo => $realdestrepo";
     rename $destrepo, $realdestrepo or die $!;
     remove "$destrepo.lock" or die $!;
@@ -301,6 +324,7 @@ sub main__git_receive_pack () {
     makeworkingclone();
     setupstunthook();
     runcmd qw(git receive-pack), $workrepo;
+    dealwithfreshrepo();
     maybeinstallprospective();
 }
 
@@ -523,9 +547,9 @@ sub checks () {
     debug "translated version $v";
     $tagname eq "debian/$v" or die;
 
-    my ($policy) = policyhook(NOFFCHECK, 'push',$package,
-			      $version,$suite,$tagname,
-			      join(",",@delberatelies));
+    $policy = policyhook(NOFFCHECK|FRESHREPO, 'push',$package,
+			 $version,$suite,$tagname,
+			 join(",",@delberatelies));
 
     checksuite();
 
@@ -536,17 +560,24 @@ sub checks () {
 	chomp $mb;
 	$mb eq $oldcommit or reject "not fast forward on dgit branch";
     }
-}
 
-sub onwardpush () {
-    my @cmd = (qw(git send-pack), $destrepo,
-	       "$commit:refs/dgit/$suite",
-	       "$tagval:refs/tags/$tagname");
-    debugcmd @cmd;
-    $!=0;
-    my $r = system @cmd;
-    !$r or die "onward push failed: $r $!";
-}	
+    if ($policy & FRESHREPO) {
+	# This is troublesome.  We have been asked by the policy hook
+	# to receive the push into a fresh repo.  But of course we
+	# have actually already mostly received the push into the working
+	# repo.  (This is unavoidable because the instruction to use a new
+	# repo comes ultimately from the signed tag for the dgit push,
+	# which has to have been received into some repo.)
+	#
+	# So what we do is generate a fresh working repo right now and
+	# push the head and tag into it.  The presence of this fresh
+	# working repo is detected by the parent, which responds by
+	# making a fresh master repo from the template.
+
+	$destrepo = "${workrepo}_fresh"; # workrepo lock covers
+	mkrepo_fromtemplate $destrepo;
+    }
+}
 
 sub stunthook () {
     debug "stunthook";