X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=f7f2b710b9732ae11b82a0b594b17301e56a26ad;hp=824e9d1b3ccaaf010c25e4102bf6d3e2e9d04655;hb=f04599680685ea8f89bff8bc76e3dad2f8028081;hpb=a35c6336ebc9976853dfe46988866642da1994ec

diff --git a/dgit b/dgit
index 824e9d1b..f7f2b710 100755
--- a/dgit
+++ b/dgit
@@ -2070,23 +2070,44 @@ sub generate_commits_from_dsc () {
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
+	my $upper_f = "../../../../$f";
+
+	printdebug "considering reusing $f: ";
+
+	if (link_ltarget "$upper_f,fetch", $f) {
+	    printdebug "linked (using ...,fetch).\n";
+	} elsif ((printdebug "($!) "),
+		 $! != ENOENT) {
+	    fail "accessing ../$f,fetch: $!";
+	} elsif (link_ltarget $upper_f, $f) {
+	    printdebug "linked.\n";
+	} elsif ((printdebug "($!) "),
+		 $! != ENOENT) {
+	    fail "accessing ../$f: $!";
+	} else {
+	    printdebug "absent.\n";
+	}
 
-	printdebug "considering linking $f: ";
-
-	link_ltarget "../../../../$f", $f
-	    or ((printdebug "($!) "), 0)
-	    or $!==&ENOENT
-	    or die "$f $!";
-
-	printdebug "linked.\n";
-
-	complete_file_from_dsc('.', $fi)
+	my $refetched;
+	complete_file_from_dsc('.', $fi, \$refetched)
 	    or next;
 
-	if (is_orig_file_in_dsc($f, \@dfi)) {
-	    link $f, "../../../../$f"
-		or $!==&EEXIST
-		or die "$f $!";
+	printdebug "considering saving $f: ";
+
+	if (link $f, $upper_f) {
+	    printdebug "linked.\n";
+	} elsif ((printdebug "($!) "),
+		 $! != EEXIST) {
+	    fail "saving ../$f: $!";
+	} elsif (!$refetched) {
+	    printdebug "no need.\n";
+	} elsif (link $f, "$upper_f,fetch") {
+	    printdebug "linked (using ...,fetch).\n";
+	} elsif ((printdebug "($!) "),
+		 $! != EEXIST) {
+	    fail "saving ../$f,fetch: $!";
+	} else {
+	    printdebug "cannot.\n";
 	}
     }
 
@@ -2457,39 +2478,56 @@ END
     return @output;
 }
 
-sub complete_file_from_dsc ($$) {
-    our ($dstdir, $fi) = @_;
-    # Ensures that we have, in $dir, the file $fi, with the correct
+sub complete_file_from_dsc ($$;$) {
+    our ($dstdir, $fi, $refetched) = @_;
+    # Ensures that we have, in $dstdir, the file $fi, with the correct
     # contents.  (Downloading it from alongside $dscurl if necessary.)
+    # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
+    # and will set $$refetched=1 if it did so (or tried to).
 
     my $f = $fi->{Filename};
     my $tf = "$dstdir/$f";
     my $downloaded = 0;
 
+    my $got;
+    my $checkhash = sub {
+	open F, "<", "$tf" or die "$tf: $!";
+	$fi->{Digester}->reset();
+	$fi->{Digester}->addfile(*F);
+	F->error and die $!;
+	my $got = $fi->{Digester}->hexdigest();
+	return $got eq $fi->{Hash};
+    };
+
     if (stat_exists $tf) {
-	progress "using existing $f";
+	if ($checkhash->()) {
+	    progress "using existing $f";
+	    return 1;
+	}
+	if (!$refetched) {
+	    fail "file $f has hash $got but .dsc".
+		" demands hash $fi->{Hash} ".
+		"(perhaps you should delete this file?)";
+	}
+	progress "need to fetch correct version of $f";
+	unlink $tf or die "$tf $!";
+	$$refetched = 1;
     } else {
 	printdebug "$tf does not exist, need to fetch\n";
-	my $furl = $dscurl;
-	$furl =~ s{/[^/]+$}{};
-	$furl .= "/$f";
-	die "$f ?" unless $f =~ m/^\Q${package}\E_/;
-	die "$f ?" if $f =~ m#/#;
-	runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
-	return 0 if !act_local();
-	$downloaded = 1;
-    }
-
-    open F, "<", "$tf" or die "$tf: $!";
-    $fi->{Digester}->reset();
-    $fi->{Digester}->addfile(*F);
-    F->error and die $!;
-    my $got = $fi->{Digester}->hexdigest();
-    $got eq $fi->{Hash} or
+    }
+
+    my $furl = $dscurl;
+    $furl =~ s{/[^/]+$}{};
+    $furl .= "/$f";
+    die "$f ?" unless $f =~ m/^\Q${package}\E_/;
+    die "$f ?" if $f =~ m#/#;
+    runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
+    return 0 if !act_local();
+
+    $checkhash->() or
 	fail "file $f has hash $got but .dsc".
 	    " demands hash $fi->{Hash} ".
-	    ($downloaded ? "(got wrong file from archive!)"
-	     : "(perhaps you should delete this file?)");
+	    "(got wrong file from archive!)";
 
     return 1;
 }
@@ -2843,8 +2881,10 @@ END
     };
 
     if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
-	my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
-	$mapref = $lrf.'/'.$rewritemap;
+	if (!defined $mapref) {
+	    my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
+	    $mapref = $lrf.'/'.$rewritemap;
+	}
 	my $rewritemapdata = git_cat_file $mapref.':map';
 	if (defined $rewritemapdata
 	    && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
@@ -3281,6 +3321,7 @@ sub multisuite_suite_child ($$$) {
     my $canonsuitefh = IO::File::new_tmpfile;
     my $pid = fork // die $!;
     if (!$pid) {
+	forkcheck_setup();
 	$isuite = $tsuite;
 	$us .= " [$isuite]";
 	$debugprefix .= " ";
@@ -5623,12 +5664,12 @@ sub cmd_clean () {
 sub build_prep_early () {
     our $build_prep_early_done //= 0;
     return if $build_prep_early_done++;
-    notpushing();
     badusage "-p is not allowed when building" if defined $package;
     my $clogp = parsechangelog();
     $isuite = getfield $clogp, 'Distribution';
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+    notpushing();
     check_not_dirty();
 }
 
@@ -6103,6 +6144,8 @@ Specify  +$specbranch to overwrite, discarding existing history
 END
 	if $oldhash && !$force;
 
+    notpushing();
+
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};