X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=54c38c24f534c668b3ecf6e3fccbd62d70cb5c48;hb=302a82c5e9e200fe93befefbdeb2b9ccfac00239;hp=0cac521012390f042ff7ccc8a392d224b17c7c82;hpb=b4adde108b83933d435bf2a494413c9c9deaa23a;p=dgit.git

diff --git a/dgit b/dgit
index 0cac5210..54c38c24 100755
--- a/dgit
+++ b/dgit
@@ -142,7 +142,7 @@ our %opts_cfg_insertpos = map {
     scalar @{ $opts_opt_map{$_} }
 } keys %opts_opt_map;
 
-sub finalise_opts_opts();
+sub parseopts_late_defaults();
 
 our $keyid;
 
@@ -791,11 +791,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 ($) {
@@ -3723,7 +3723,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);
@@ -3740,7 +3744,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) = @_;
@@ -4076,7 +4079,6 @@ END
 
 sub cmd_clone {
     parseopts();
-    notpushing();
     my $dstdir;
     badusage "-p is not allowed with clone; specify as argument instead"
 	if defined $package;
@@ -4091,8 +4093,9 @@ sub cmd_clone {
     } else {
 	badusage "incorrect arguments to dgit clone";
     }
-    $dstdir ||= "$package";
+    notpushing();
 
+    $dstdir ||= "$package";
     if (stat_exists $dstdir) {
 	fail "$dstdir already exists";
     }
@@ -4131,7 +4134,6 @@ sub branchsuite () {
 }
 
 sub fetchpullargs () {
-    notpushing();
     if (!defined $package) {
 	my $sourcep = parsecontrol('debian/control','debian/control');
 	$package = getfield $sourcep, 'Source';
@@ -4147,6 +4149,7 @@ sub fetchpullargs () {
     } else {
 	badusage "incorrect arguments to dgit fetch or dgit pull";
     }
+    notpushing();
 }
 
 sub cmd_fetch {
@@ -5637,6 +5640,7 @@ sub postbuild_mergechanges_vanilla ($) {
 }
 
 sub cmd_build {
+    build_prep_early();
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     my $wantsrc = massage_dbp_args \@dbp;
     if ($wantsrc > 0) {
@@ -5729,6 +5733,7 @@ sub cmd_gbp_build {
 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
 
 sub build_source {
+    build_prep_early();
     my $our_cleanmode = $cleanmode;
     if ($need_split_build_invocation) {
 	# Pretend that clean is being done some other way.  This
@@ -5789,6 +5794,7 @@ sub build_source {
 }
 
 sub cmd_build_source {
+    build_prep_early();
     badusage "build-source takes no additional arguments" if @ARGV;
     build_source();
     maybe_unapply_patches_again();
@@ -6261,7 +6267,7 @@ END
 }
 
 
-sub finalise_opts_opts () {
+sub parseopts_late_defaults () {
     foreach my $k (keys %opts_opt_map) {
 	my $om = $opts_opt_map{$k};
 
@@ -6288,6 +6294,40 @@ sub finalise_opts_opts () {
 		     @$om[$insertpos..$#$om] );
 	}
     }
+
+    if (!defined $rmchanges) {
+	local $access_forpush;
+	$rmchanges = access_cfg_bool(0, 'rm-old-changes');
+    }
+
+    if (!defined $quilt_mode) {
+	local $access_forpush;
+	$quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
+	    // access_cfg('quilt-mode', 'RETURN-UNDEF')
+	    // 'linear';
+	$quilt_mode =~ m/^($quilt_modes_re)$/ 
+	    or badcfg "unknown quilt-mode \`$quilt_mode'";
+	$quilt_mode = $1;
+    }
+
+    if (!defined $dodep14tag) {
+	local $access_forpush;
+	$dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
+	$dodep14tag =~ m/^($dodep14tag_re)$/ 
+	    or badcfg "unknown dep14tag setting \`$dodep14tag'";
+	$dodep14tag = $1;
+    }
+
+    $need_split_build_invocation ||= quiltmode_splitbrain();
+
+    if (!defined $cleanmode) {
+	local $access_forpush;
+	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
+	$cleanmode //= 'dpkg-source';
+
+	badcfg "unknown clean-mode \`$cleanmode'" unless
+	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
+    }
 }
 
 if ($ENV{$fakeeditorenv}) {
@@ -6312,40 +6352,6 @@ $cmd =~ y/-/_/;
 my $pre_fn = ${*::}{"pre_$cmd"};
 $pre_fn->() if $pre_fn;
 
-if (!defined $rmchanges) {
-    local $access_forpush;
-    $rmchanges = access_cfg_bool(0, 'rm-old-changes');
-}
-
-if (!defined $quilt_mode) {
-    local $access_forpush;
-    $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
-	// access_cfg('quilt-mode', 'RETURN-UNDEF')
-	// 'linear';
-    $quilt_mode =~ m/^($quilt_modes_re)$/ 
-	or badcfg "unknown quilt-mode \`$quilt_mode'";
-    $quilt_mode = $1;
-}
-
-if (!defined $dodep14tag) {
-    local $access_forpush;
-    $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
-    $dodep14tag =~ m/^($dodep14tag_re)$/ 
-	or badcfg "unknown dep14tag setting \`$dodep14tag'";
-    $dodep14tag = $1;
-}
-
-$need_split_build_invocation ||= quiltmode_splitbrain();
-
-if (!defined $cleanmode) {
-    local $access_forpush;
-    $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
-    $cleanmode //= 'dpkg-source';
-
-    badcfg "unknown clean-mode \`$cleanmode'" unless
-	$cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
-}
-
 my $fn = ${*::}{"cmd_$cmd"};
 $fn or badusage "unknown operation $cmd";
 $fn->();