X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=845edd3aa22878a3571116c59d37a743fba4ea8f;hp=9df8294adbf8a5eea0db4c44c4dba7828a109aca;hb=8e176e95b2137b2103bba97c8cd6af09a3fdc4a7;hpb=9831dc86c3e40fc6fc1ea0f8df0f1887bc8284d5

diff --git a/dgit b/dgit
index 9df8294a..845edd3a 100755
--- a/dgit
+++ b/dgit
@@ -142,7 +142,6 @@ our %opts_cfg_insertpos = map {
     scalar @{ $opts_opt_map{$_} }
 } keys %opts_opt_map;
 
-sub finalise_opts_opts();
 sub parseopts_late_defaults();
 
 our $keyid;
@@ -186,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+\://;
@@ -684,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".
@@ -700,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";
@@ -728,7 +708,10 @@ sub access_basedistro () {
 
 sub access_nomdistro () {
     my $base = access_basedistro();
-    return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
+    my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
+    $r =~ m/^$distro_re$/ or badcfg
+ "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
+    return $r;
 }
 
 sub access_quirk () {
@@ -792,11 +775,11 @@ sub pushing () {
 Push failed, before we got started.
 You can retry the push, after fixing the problem, if you like.
 END
-    finalise_opts_opts();
+    parseopts_late_defaults();
 }
 
 sub notpushing () {
-    finalise_opts_opts();
+    parseopts_late_defaults();
 }
 
 sub supplementary_message ($) {
@@ -1681,6 +1664,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';
 
@@ -2504,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 *,
@@ -2540,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 = $_;
@@ -2548,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;
@@ -2557,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!";
 	}
@@ -2589,11 +2588,10 @@ 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;
+	runcmd_ordryrun_local @fcmd if @fspecs;
 
 	%lrfetchrefs_f = ();
 	my %objgot;
@@ -2645,8 +2643,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);
@@ -2673,6 +2688,8 @@ END
     });
 }
 
+#---------- dsc and archive handling ----------
+
 sub mergeinfo_getclogp ($) {
     # Ensures thit $mi->{Clogp} exists and returns it
     my ($mi) = @_;
@@ -2701,6 +2718,49 @@ sub fetch_from_archive_record_2 ($) {
     }
 }
 
+sub parse_dsc_field ($$) {
+    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 (($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();
 
@@ -2712,33 +2772,13 @@ sub fetch_from_archive () {
     get_archive_dsc();
 
     if ($dsc) {
-	foreach my $field (@ourdscfield) {
-	    $dsc_hash = $dsc->{$field};
-	    last if defined $dsc_hash;
-	}
-	if (defined $dsc_hash) {
-	    $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
-	    $dsc_hash = $&;
-	    progress "last upload to archive specified git hash";
-	} else {
-	    progress "last upload to archive has NO git hash";
-	}
+	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:
@@ -3724,7 +3764,11 @@ sub push_mktags ($$ $$ $) {
 
     die unless $tagwants->[0]{View} eq 'dgit';
 
-    $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
+    my $declaredistro = access_nomdistro();
+    my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
+    $dsc->{$ourdscfield[0]} = join " ",
+	$tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
+	$reader_giturl;
     $dsc->save("$dscfn.tmp") or die $!;
 
     my $changes = parsecontrol($changesfile,$changesfilewhat);
@@ -3741,7 +3785,6 @@ sub push_mktags ($$ $$ $) {
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
     my $delibs = join(" ", "",@deliberatelies);
-    my $declaredistro = access_nomdistro();
 
     my $mktag = sub {
 	my ($tw) = @_;
@@ -4132,7 +4175,6 @@ sub branchsuite () {
 }
 
 sub fetchpullargs () {
-    notpushing();
     if (!defined $package) {
 	my $sourcep = parsecontrol('debian/control','debian/control');
 	$package = getfield $sourcep, 'Source';
@@ -4148,6 +4190,7 @@ sub fetchpullargs () {
     } else {
 	badusage "incorrect arguments to dgit fetch or dgit pull";
     }
+    notpushing();
 }
 
 sub cmd_fetch {
@@ -5889,31 +5932,30 @@ sub cmd_import_dsc {
 
     parse_dscdata();
 
-    my $dgit_commit = $dsc->{$ourdscfield[0]};
-    if (defined $dgit_commit
+    parse_dsc_field($dsc, "Dgit metadata in .dsc");
+
+    if (defined $dsc_hash
 	&& !forceing [qw(import-dsc-with-dgit-field)]) {
-	$dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
-	$dgit_commit = $&;
 	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
 	my @cmd = (qw(sh -ec),
-		   "echo $dgit_commit | git cat-file --batch-check");
+		   "echo $dsc_hash | git cat-file --batch-check");
 	my $objgot = cmdoutput @cmd;
 	if ($objgot =~ m#^\w+ missing\b#) {
 	    fail <<END
-.dsc contains Dgit field referring to object $dgit_commit
+.dsc contains Dgit field referring to object $dsc_hash
 Your git tree does not have that object.  Try `git fetch' from a
 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
 END
 	}
-	if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
+	if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
 	    if ($force > 0) {
 		progress "Not fast forward, forced update.";
 	    } else {
-		fail "Not fast forward to $dgit_commit";
+		fail "Not fast forward to $dsc_hash";
 	    }
 	}
 	@cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
-		$dstbranch, $dgit_commit);
+		$dstbranch, $dsc_hash);
 	runcmd @cmd;
 	progress "dgit: import-dsc updated git ref $dstbranch";
 	return 0;
@@ -6265,7 +6307,7 @@ END
 }
 
 
-sub finalise_opts_opts () {
+sub parseopts_late_defaults () {
     foreach my $k (keys %opts_opt_map) {
 	my $om = $opts_opt_map{$k};
 
@@ -6293,10 +6335,6 @@ sub finalise_opts_opts () {
 	}
     }
 
-    parseopts_late_defaults();
-}
-
-sub parseopts_late_defaults () {
     if (!defined $rmchanges) {
 	local $access_forpush;
 	$rmchanges = access_cfg_bool(0, 'rm-old-changes');