X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=5ca4a817aa1ddf47c52ace3f2e36f12ae5b53391;hb=87e828d271c0f37bb33ca723fa991d6afc3ec76f;hp=0cd122ef23aaabec7537c3c4389a51947c89dbab;hpb=54eabf5833c128f7158550c37e4fef9c4d5ef846;p=dgit.git

diff --git a/dgit b/dgit
index 0cd122ef..5ca4a817 100755
--- a/dgit
+++ b/dgit
@@ -70,7 +70,6 @@ our $overwrite_version; # undef: not specified; '': check changelog
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
 our $dodep14tag;
-our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;
 our $we_are_initiator;
@@ -156,6 +155,7 @@ our $split_brain = 0;
 
 END {
     local ($@, $?);
+    return unless forkcheck_mainprocess();
     print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
 }
 
@@ -220,6 +220,7 @@ initdebug('');
 our @end;
 END { 
     local ($?);
+    return unless forkcheck_mainprocess();
     foreach my $f (@end) {
 	eval { $f->(); };
 	print STDERR "$us: cleanup: $@" if length $@;
@@ -2072,21 +2073,43 @@ sub generate_commits_from_dsc () {
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
 	my $upper_f = "../../../../$f";
 
-	printdebug "considering linking $f: ";
-
-	link_ltarget $upper_f, $f
-	    or ((printdebug "($!) "), 0)
-	    or $!==&ENOENT
-	    or die "$f $!";
-
-	printdebug "linked.\n";
+	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";
+	}
 
-	complete_file_from_dsc('.', $fi)
+	my $refetched;
+	complete_file_from_dsc('.', $fi, \$refetched)
 	    or next;
 
-	link $f, $upper_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";
+	}
     }
 
     # We unpack and record the orig tarballs first, so that we only
@@ -2533,7 +2556,7 @@ sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
 # (If we deleted them unconditionally, then we might end up
 # re-fetching the same git objects each time dgit fetch was run.)
 #
-# So, leach use of lrfetchrefs needs to be accompanied by arrangements
+# So, each use of lrfetchrefs needs to be accompanied by arrangements
 # in git_fetch_us to fetch the refs in question, and possibly a call
 # to lrfetchref_used.
 
@@ -2740,8 +2763,8 @@ sub git_fetch_us () {
 	} elsif ($here{$lref} eq $objid) {
 	    lrfetchref_used $fullrefname;
 	} else {
-	    print STDERR \
-		"Not updateting $lref from $here{$lref} to $objid.\n";
+	    print STDERR
+		"Not updating $lref from $here{$lref} to $objid.\n";
 	}
     });
 }
@@ -2783,6 +2806,12 @@ sub parse_dsc_field ($$) {
 	$f = $dsc->{$field};
 	last if defined $f;
     }
+
+    my $def_dsc_distro = sub {
+	$dsc_distro //= cfg qw(dgit.default.old-dsc-distro
+			       dgit.default.distro);
+    };
+
     if (!defined $f) {
 	progress "$what: NO git hash";
     } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
@@ -2791,8 +2820,7 @@ sub parse_dsc_field ($$) {
 	$dsc_hint_tag = [ $dsc_hint_tag ];
     } elsif ($f =~ m/^\w+\s*$/) {
 	$dsc_hash = $&;
-	$dsc_distro //= cfg qw(dgit.default.old-dsc-distro
-			       dgit.default.distro);
+	$def_dsc_distro->();
 	$dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
 			  $dsc_distro ];
 	progress "$what: specified git hash";
@@ -2888,7 +2916,7 @@ but we could not obtain that object anywhere.
 END
 	foreach my $t (@tags) {
 	    my $fullrefname = $lrf.'/'.$t;
-	    print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
+#	    print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
 	    next unless $lrfetchrefs_f{$fullrefname};
 	    next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
 	    lrfetchref_used $fullrefname;
@@ -3299,6 +3327,7 @@ sub multisuite_suite_child ($$$) {
     my $canonsuitefh = IO::File::new_tmpfile;
     my $pid = fork // die $!;
     if (!$pid) {
+	forkcheck_setup();
 	$isuite = $tsuite;
 	$us .= " [$isuite]";
 	$debugprefix .= " ";
@@ -4450,7 +4479,10 @@ sub i_cleanup {
     }
 }
 
-END { i_cleanup(); }
+END {
+    return unless forkcheck_mainprocess();
+    i_cleanup();
+}
 
 sub i_method {
     my ($base,$selector,@args) = @_;
@@ -5641,12 +5673,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();
 }
 
@@ -6229,7 +6261,9 @@ sub cmd_version {
 }
 
 our (%valopts_long, %valopts_short);
+our (%funcopts_long);
 our @rvalopts;
+our (@modeopt_cfgs);
 
 sub defvalopt ($$$$) {
     my ($long,$short,$val_re,$how) = @_;
@@ -6265,6 +6299,26 @@ defvalopt '--initiator-tempdir','','.*', sub {
 	" absolute, not relative, directory."
 };
 
+sub defoptmodes ($@) {
+    my ($varref, $cfgkey, $default, %optmap) = @_;
+    my %permit;
+    while (my ($opt,$val) = each %optmap) {
+	$funcopts_long{$opt} = sub { $$varref = $val; };
+	$permit{$val} = $val;
+    }
+    push @modeopt_cfgs, {
+        Var => $varref,
+        Key => $cfgkey,
+        Default => $default,
+        Vals => \%permit
+    };
+}
+
+defoptmodes \$dodep14tag, qw( dep14tag          want
+			      --dep14tag        want
+			      --no-dep14tag     no
+			      --always-dep14tag always );
+
 sub parseopts () {
     my $om;
 
@@ -6347,15 +6401,6 @@ sub parseopts () {
 	    } elsif (m/^--overwrite=(.+)$/s) {
 		push @ropts, $_;
 		$overwrite_version = $1;
-	    } elsif (m/^--dep14tag$/s) {
-		push @ropts, $_;
-		$dodep14tag= 'want';
-	    } elsif (m/^--no-dep14tag$/s) {
-		push @ropts, $_;
-		$dodep14tag= 'no';
-	    } elsif (m/^--always-dep14tag$/s) {
-		push @ropts, $_;
-		$dodep14tag= 'always';
 	    } elsif (m/^--delayed=(\d+)$/s) {
 		push @ropts, $_;
 		push @dput, $_;
@@ -6394,6 +6439,9 @@ sub parseopts () {
 	    } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
 		$val = $2 ? $' : undef; #';
 		$valopt->($oi->{Long});
+	    } elsif ($funcopts_long{$_}) {
+		push @ropts, $_;
+		$funcopts_long{$_}();
 	    } else {
 		badusage "unknown long option \`$_'";
 	    }
@@ -6526,12 +6574,14 @@ sub parseopts_late_defaults () {
 	$quilt_mode = $1;
     }
 
-    if (!defined $dodep14tag) {
+    foreach my $moc (@modeopt_cfgs) {
 	local $access_forpush;
-	$dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
-	$dodep14tag =~ m/^($dodep14tag_re)$/ 
-	    or badcfg "unknown dep14tag setting \`$dodep14tag'";
-	$dodep14tag = $1;
+	my $vr = $moc->{Var};
+	next if defined $$vr;
+	$$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
+	my $v = $moc->{Vals}{$$vr};
+	badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
+	$$vr = $v;
     }
 
     $need_split_build_invocation ||= quiltmode_splitbrain();