X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=2427f72c06119acd0c3a01b939941f5d825cebcb;hp=de7b4de625ec4520ff13d552cee200172d76c3b3;hb=68d88a087c25d9e1cee7106938ab4e9751cfa146;hpb=76c7db35e2ddaa0c517128fae11cd5893099fffc

diff --git a/dgit b/dgit
index de7b4de6..2427f72c 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+\://;
@@ -1683,6 +1659,7 @@ sub create_remote_git_repo () {
 }
 
 our ($dsc_hash,$lastpush_mergeinput);
+our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
 
 our $ud = '.git/dgit/unpack';
 
@@ -2506,19 +2483,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 *,
@@ -2649,6 +2641,23 @@ END
     }
     printdebug "git_fetch_us: 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);
@@ -2675,6 +2684,8 @@ END
     });
 }
 
+#---------- dsc and archive handling ----------
+
 sub mergeinfo_getclogp ($) {
     # Ensures thit $mi->{Clogp} exists and returns it
     my ($mi) = @_;
@@ -2704,17 +2715,48 @@ sub fetch_from_archive_record_2 ($) {
 }
 
 sub parse_dsc_field ($$) {
-    my ($f, $what) = @_;
+    my ($dsc, $what) = @_;
+    my $f;
+    foreach my $field (@ourdscfield) {
+	$f = $dsc->{$field};
+	last if defined $f;
+    }
     if (!defined $f) {
 	progress "$what: NO git hash";
-    } elsif ($f =~ m/^\w+/) {
+    } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
+	     = $f =~ m/^(\w+) ($distro_re) ($versiontag_re) (\S+)(?:\s|$)/) {
+	progress "$what: specified git info ($dsc_distro)";
+	$dsc_hint_tag = [ $dsc_hint_tag ];
+    } elsif ($f =~ m/^\w+\s*$/) {
 	$dsc_hash = $&;
+	$dsc_distro //= 'debian';
+	$dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
+			  $dsc_distro ];
 	progress "$what: specified git hash";
     } else {
 	fail "$what: invalid Dgit info";
     }
 }
 
+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();
 
@@ -2726,28 +2768,13 @@ sub fetch_from_archive () {
     get_archive_dsc();
 
     if ($dsc) {
-	my $f;
-	foreach my $field (@ourdscfield) {
-	    $f = $dsc->{$field};
-	    last if defined $f;
-	}
-	parse_dsc_field($f, 'last upload to archive');
+	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:
@@ -5901,8 +5928,7 @@ sub cmd_import_dsc {
 
     parse_dscdata();
 
-    my $dgit_field = $dsc->{$ourdscfield[0]};
-    parse_dsc_field($dgit_field, "$ourdscfield[0] field in .dsc");
+    parse_dsc_field($dsc, "Dgit metadata in .dsc");
 
     if (defined $dsc_hash
 	&& !forceing [qw(import-dsc-with-dgit-field)]) {