X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=56cee1140814185072007d6acf2f2e9336b9f6dd;hp=c652e5db10113279fc22aa6d20ece200a641342f;hb=37e3be3b6a61e26f9836d3575531ba716818b134;hpb=904a32db88f4a3856a046ca336fe7232dcca0b3d

diff --git a/dgit b/dgit
index c652e5db..56cee114 100755
--- a/dgit
+++ b/dgit
@@ -98,6 +98,12 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'mergechanges' => \@mergechanges);
 
 our %opts_opt_cmdonly = ('gpg' => 1);
+our %opts_cfg_insertpos = map {
+    $_,
+    scalar @{ $opts_opt_map{$_} }
+} keys %opts_opt_map;
+
+sub finalise_opts_opts();
 
 our $keyid;
 
@@ -497,28 +503,36 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
 
-sub git_get_config ($) {
-    my ($c) = @_;
+our %gitcfg;
 
-    our %git_get_config_memo;
-    if (exists $git_get_config_memo{$c}) {
-	return $git_get_config_memo{$c};
-    }
+sub git_slurp_config () {
+    local ($debuglevel) = $debuglevel-2;
+    local $/="\0";
 
-    my $v;
-    my @cmd = (@git, qw(config --), $c);
-    {
-	local ($debuglevel) = $debuglevel-2;
-	$v = cmdoutput_errok @cmd;
-    };
-    if ($?==0) {
-    } elsif ($?==256) {
-	$v = undef;
-    } else {
-	failedcmd @cmd;
+    my @cmd = (@git, qw(config -z --get-regexp .*));
+    debugcmd "|",@cmd;
+
+    open GITS, "-|", @cmd or failedcmd @cmd;
+    while (<GITS>) {
+	chomp or die;
+	printdebug "=> ", (messagequote $_), "\n";
+	m/\n/ or die "$_ ?";
+	push @{ $gitcfg{$`} }, $'; #';
     }
-    $git_get_config_memo{$c} = $v;
-    return $v;
+    $!=0; $?=0;
+    close GITS
+	or ($!==0 && $?==256)
+	or failedcmd @cmd;
+}
+
+sub git_get_config ($) {
+    my ($c) = @_;
+    my $l = $gitcfg{$c};
+    printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+	if $debuglevel >= 4;
+    $l or return undef;
+    @$l==1 or badcfg "multiple values for $c" if @$l > 1;
+    return $l->[0];
 }
 
 sub cfg {
@@ -603,6 +617,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();
+}
+
+sub notpushing () {
+    finalise_opts_opts();
 }
 
 sub supplementary_message ($) {
@@ -638,7 +657,7 @@ sub access_distros () {
     @l;
 }
 
-sub access_cfg (@) {
+sub access_cfg_cfgs (@) {
     my (@keys) = @_;
     my @cfgs;
     # The nesting of these loops determines the search order.  We put
@@ -665,6 +684,12 @@ sub access_cfg (@) {
     }
     push @cfgs, map { "dgit.default.$_" } @realkeys;
     push @cfgs, @rundef;
+    return @cfgs;
+}
+
+sub access_cfg (@) {
+    my (@keys) = @_;
+    my (@cfgs) = access_cfg_cfgs(@keys);
     my $value = cfg(@cfgs);
     return $value;
 }
@@ -2004,6 +2029,7 @@ END
 
 sub cmd_clone {
     parseopts();
+    notpushing();
     my $dstdir;
     badusage "-p is not allowed with clone; specify as argument instead"
 	if defined $package;
@@ -2051,6 +2077,7 @@ sub branchsuite () {
 }
 
 sub fetchpullargs () {
+    notpushing();
     if (!defined $package) {
 	my $sourcep = parsecontrol('debian/control','debian/control');
 	$package = getfield $sourcep, 'Source';
@@ -2084,8 +2111,8 @@ sub cmd_pull {
 }
 
 sub cmd_push {
-    pushing();
     parseopts();
+    pushing();
     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();
@@ -2823,10 +2850,12 @@ sub clean_tree () {
 
 sub cmd_clean () {
     badusage "clean takes no additional arguments" if @ARGV;
+    notpushing();
     clean_tree();
 }
 
 sub build_prep () {
+    notpushing();
     badusage "-p is not allowed when building" if defined $package;
     check_not_dirty();
     clean_tree();
@@ -3030,7 +3059,7 @@ sub parseopts () {
 	    } elsif (m/^--since-version=([^_]+|_)$/) {
 		push @ropts, $_;
 		$changes_since_version = $1;
-	    } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
+	    } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
 		     ($om = $opts_opt_map{$1}) &&
 		     length $om->[0]) {
 		push @ropts, $_;
@@ -3146,11 +3175,40 @@ sub parseopts () {
     }
 }
 
+sub finalise_opts_opts () {
+    foreach my $k (keys %opts_opt_map) {
+	my $om = $opts_opt_map{$k};
+
+	my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
+	if (defined $v) {
+	    badcfg "cannot set command for $k"
+		unless length $om->[0];
+	    $om->[0] = $v;
+	}
+
+	foreach my $c (access_cfg_cfgs("opts-$k")) {
+	    my $vl = $gitcfg{$c};
+	    printdebug "CL $c ",
+	        ($vl ? join " ", map { shellquote } @$vl : ""),
+	        "\n" if $debuglevel >= 4;
+	    next unless $vl;
+	    badcfg "cannot configure options for $k"
+		if $opts_opt_cmdonly{$k};
+	    my $insertpos = $opts_cfg_insertpos{$k};
+	    @$om = ( @$om[0..$insertpos-1],
+		     @$vl,
+		     @$om[$insertpos..$#$om] );
+	}
+    }
+}
+
 if ($ENV{$fakeeditorenv}) {
+    git_slurp_config();
     quilt_fixup_editor();
 }
 
 parseopts();
+git_slurp_config();
 
 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"