X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=d524bd2de0885bf2f2d1d5f5b8f145573259f845;hp=7d2dd8516386285f22afa0da28f162bc825b457e;hb=2ecbfc70bba339e0475b745f5d5615675e427370;hpb=19c2d673555201bf2bf6891cdd69236b1e599fb0

diff --git a/dgit b/dgit
index 7d2dd851..d524bd2d 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,19 +2488,34 @@ sub ensure_we_have_orig () {
     }
 }
 
-sub git_fetch_us () {
-    # Want to fetch only what we are going to use, unless
-    # deliberately-not-ff, in which case we must fetch everything.
+#---------- git fetch ----------
 
-    my @specs = deliberately_not_fast_forward ? qw(tags/*) :
-	map { "tags/$_" }
-	(quiltmode_splitbrain
-	 ? (map { $_->('*',access_nomdistro) }
-	    \&debiantag_new, \&debiantag_maintview)
-	 : debiantags('*',access_nomdistro));
-    push @specs, server_branch($csuite);
-    push @specs, $rewritemap;
-    push @specs, qw(heads/*) if deliberately_not_fast_forward;
+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) = @_;
 
     # This is rather miserable:
     # When git fetch --prune is passed a fetchspec ending with a *,
@@ -2543,7 +2539,7 @@ sub git_fetch_us () {
     # 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";
+    printdebug "git_lrfetch_sane specs @specs\n";
 
     my $specre = join '|', map {
 	my $x = $_;
@@ -2551,7 +2547,7 @@ sub git_fetch_us () {
 	$x =~ s/\\\*$/.*/;
 	"(?: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;
@@ -2560,7 +2556,7 @@ sub git_fetch_us () {
     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!";
 	}
@@ -2592,7 +2588,7 @@ 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(),
@@ -2648,8 +2644,25 @@ 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);
+}
+
+sub git_fetch_us () {
+    # Want to fetch only what we are going to use, unless
+    # deliberately-not-ff, in which case we must fetch everything.
+
+    my @specs = deliberately_not_fast_forward ? qw(tags/*) :
+	map { "tags/$_" }
+	(quiltmode_splitbrain
+	 ? (map { $_->('*',access_nomdistro) }
+	    \&debiantag_new, \&debiantag_maintview)
+	 : debiantags('*',access_nomdistro));
+    push @specs, server_branch($csuite);
+    push @specs, $rewritemap;
+    push @specs, qw(heads/*) if deliberately_not_fast_forward;
+
+    git_lrfetch_sane @specs;
 
     my %here;
     my @tagpats = debiantags('*',access_nomdistro);
@@ -2676,6 +2689,8 @@ END
     });
 }
 
+#---------- dsc and archive handling ----------
+
 sub mergeinfo_getclogp ($) {
     # Ensures thit $mi->{Clogp} exists and returns it
     my ($mi) = @_;
@@ -2728,6 +2743,25 @@ sub parse_dsc_field ($$) {
     }
 }
 
+sub resolve_dsc_field_commit ($$) {
+    my ($already_distro, $already_mapref) = @_;
+
+    return unless defined $dsc_hash;
+
+    my $rewritemapdata = git_cat_file $already_mapref.':map';
+    if (defined $rewritemapdata
+	&& $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
+	progress "server's git history rewrite map contains a relevant entry!";
+
+	$dsc_hash = $1;
+	if (defined $dsc_hash) {
+	    progress "using rewritten git hash in place of .dsc value";
+	} else {
+	    progress "server data says .dsc hash is to be disregarded";
+	}
+    }
+}
+
 sub fetch_from_archive () {
     ensure_setup_existing_tree();
 
@@ -2740,22 +2774,12 @@ sub fetch_from_archive () {
 
     if ($dsc) {
 	parse_dsc_field($dsc, 'last upload to archive');
+	resolve_dsc_field_commit access_basedistro,
+	    lrfetchrefs."/".$rewritemap
     } else {
 	progress "no version available from the archive";
     }
 
-    my $rewritemapdata = git_cat_file lrfetchrefs."/".$rewritemap.':map';
-    if (defined $rewritemapdata
-	&& $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
-	progress "server's git history rewrite map contains a relevant entry!";
-	$dsc_hash = $1;
-	if (defined $dsc_hash) {
-	    progress "using rewritten git hash in place of .dsc value";
-	} else {
-	    progress "server data says .dsc hash is to be disregarded";
-	}
-    }
-
     # If the archive's .dsc has a Dgit field, there are three
     # relevant git commitids we need to choose between and/or merge
     # together: