X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=c66c7a63a19162c86ccf71cc59513707d23e045e;hp=dc31ce1775cbbe1a1fa3dbaa6726638519f9f1ef;hb=71437159c44af0328fc4bbc1826be18e4f057444;hpb=18c4fddd4c69c6c2bf225ded6c5cc2ff060e96b6

diff --git a/dgit b/dgit
index dc31ce17..c66c7a63 100755
--- a/dgit
+++ b/dgit
@@ -185,30 +185,6 @@ sub lref () { return "refs/heads/".lbranch(); }
 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
 sub rrref () { return server_ref($csuite); }
 
-sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
-sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
-
-# We fetch some parts of lrfetchrefs/*.  Ideally we delete these
-# locally fetched refs because they have unhelpful names and clutter
-# up gitk etc.  So we track whether we have "used up" head ref (ie,
-# whether we have made another local ref which refers to this object).
-#
-# (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
-# in git_fetch_us to fetch the refs in question, and possibly a call
-# to lrfetchref_used.
-
-our (%lrfetchrefs_f, %lrfetchrefs_d);
-# $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
-
-sub lrfetchref_used ($) {
-    my ($fullrefname) = @_;
-    my $objid = $lrfetchrefs_f{$fullrefname};
-    $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
-}
-
 sub stripepoch ($) {
     my ($vsn) = @_;
     $vsn =~ s/^\d+\://;
@@ -683,7 +659,9 @@ sub git_get_config ($) {
     my ($c) = @_;
     foreach my $src (@gitcfgsources) {
 	my $l = $gitcfgs{$src}{$c};
-	printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+	printdebug"C $c ".(defined $l ?
+			   join " ", map { messagequote "'$_'" } @$l :
+			   "undef")."\n"
 	    if $debuglevel >= 4;
 	$l or next;
 	@$l==1 or badcfg "multiple values for $c".
@@ -699,7 +677,10 @@ sub cfg {
 	my $v = git_get_config($c);
 	return $v if defined $v;
 	my $dv = $defcfg{$c};
-	return $dv if defined $dv;
+	if (defined $dv) {
+	    printdebug "CD $c $dv\n" if $debuglevel >= 4;
+	    return $dv;
+	}
     }
     badcfg "need value for one of: @_\n".
 	"$us: distro or suite appears not to be (properly) supported";
@@ -2507,8 +2488,41 @@ sub ensure_we_have_orig () {
     }
 }
 
+#---------- git fetch ----------
+
+sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
+sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
+
+# We fetch some parts of lrfetchrefs/*.  Ideally we delete these
+# locally fetched refs because they have unhelpful names and clutter
+# up gitk etc.  So we track whether we have "used up" head ref (ie,
+# whether we have made another local ref which refers to this object).
+#
+# (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
+# in git_fetch_us to fetch the refs in question, and possibly a call
+# to lrfetchref_used.
+
+our (%lrfetchrefs_f, %lrfetchrefs_d);
+# $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
+
+sub lrfetchref_used ($) {
+    my ($fullrefname) = @_;
+    my $objid = $lrfetchrefs_f{$fullrefname};
+    $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
+}
+
 sub git_lrfetch_sane {
-    my (@specs) = @_;
+    my ($supplementary, @specs) = @_;
+    # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
+    # at least as regards @specs.  Also leave the results in
+    # %lrfetchrefs_f, and arrange for lrfetchref_used to be
+    # able to clean these up.
+    #
+    # With $supplementary==1, @specs must not contain wildcards
+    # and we add to our previous fetches (non-atomically).
 
     # This is rather miserable:
     # When git fetch --prune is passed a fetchspec ending with a *,
@@ -2532,30 +2546,33 @@ sub git_lrfetch_sane {
     # git fetch to try to generate it.  If we don't manage to generate
     # the target state, we try again.
 
-    printdebug "git_fetch_us specs @specs\n";
+    my $url = access_giturl();
+
+    printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
 
     my $specre = join '|', map {
 	my $x = $_;
 	$x =~ s/\W/\\$&/g;
-	$x =~ s/\\\*$/.*/;
+	my $wildcard = $x =~ s/\\\*$/.*/;
+	die if $wildcard && $supplementary;
 	"(?:refs/$x)";
     } @specs;
-    printdebug "git_fetch_us specre=$specre\n";
+    printdebug "git_lrfetch_sane specre=$specre\n";
     my $wanted_rref = sub {
 	local ($_) = @_;
-	return m/^(?:$specre)$/o;
+	return m/^(?:$specre)$/;
     };
 
     my $fetch_iteration = 0;
     FETCH_ITERATION:
     for (;;) {
-	printdebug "git_fetch_us iteration $fetch_iteration\n";
+	printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
         if (++$fetch_iteration > 10) {
 	    fail "too many iterations trying to get sane fetch!";
 	}
 
 	my @look = map { "refs/$_" } @specs;
-	my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
+	my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
 	debugcmd "|",@lcmd;
 
 	my %wantr;
@@ -2581,13 +2598,14 @@ END
 	    "+refs/$_:".lrfetchrefs."/$_";
 	} @specs;
 
-	printdebug "git_fetch_us fspecs @fspecs\n";
+	printdebug "git_lrfetch_sane fspecs @fspecs\n";
 
-	my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
-	runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
-	    @fspecs;
+	my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
+	runcmd_ordryrun_local @fcmd if @fspecs;
 
-	%lrfetchrefs_f = ();
+	if (!$supplementary) {
+	    %lrfetchrefs_f = ();
+	}
 	my %objgot;
 
 	git_for_each_ref(lrfetchrefs, sub {
@@ -2596,6 +2614,10 @@ END
 	    $objgot{$objid} = 1;
 	});
 
+	if ($supplementary) {
+	    last;
+	}
+
 	foreach my $lrefname (sort keys %lrfetchrefs_f) {
 	    my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
 	    if (!exists $wantr{$rrefname}) {
@@ -2637,7 +2659,7 @@ END
 	}
 	last;
     }
-    printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
+    printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
 	Dumper(\%lrfetchrefs_f);
 }
 
@@ -2655,7 +2677,7 @@ sub git_fetch_us () {
     push @specs, $rewritemap;
     push @specs, qw(heads/*) if deliberately_not_fast_forward;
 
-    git_lrfetch_sane @specs;
+    git_lrfetch_sane 0, @specs;
 
     my %here;
     my @tagpats = debiantags('*',access_nomdistro);
@@ -2682,6 +2704,8 @@ sub git_fetch_us () {
     });
 }
 
+#---------- dsc and archive handling ----------
+
 sub mergeinfo_getclogp ($) {
     # Ensures thit $mi->{Clogp} exists and returns it
     my ($mi) = @_;