X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=ae96531e38072c586035a080e9db3f7fd0c4d399;hb=b1772b364e75b32c413db7060a0adf8b124c84db;hp=4c6cc9c29124f9a145ad9b63a540cad68beca0ed;hpb=f4e23593ad4e04711ec34d5b1d70f3a0508f2b66;p=dgit.git

diff --git a/dgit b/dgit
index 4c6cc9c2..ae96531e 100755
--- a/dgit
+++ b/dgit
@@ -98,7 +98,11 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'mergechanges' => \@mergechanges);
 
 our %opts_opt_cmdonly = ('gpg' => 1);
-our %opts_opt_cmdline_opts;
+our %opts_cfg_insertpos = map {
+    $_,
+    scalar @{ $opts_opt_map{$_} }
+} keys %opts_opt_map;
+
 sub finalise_opts_opts();
 
 our $keyid;
@@ -499,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 {
@@ -682,6 +694,11 @@ sub access_cfg (@) {
     return $value;
 }
 
+sub access_cfg_bool ($$) {
+    my ($def, @keys) = @_;
+    parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
+}
+
 sub string_to_ssh ($) {
     my ($spec) = @_;
     if ($spec =~ m/\s/) {
@@ -972,7 +989,7 @@ sub sshpsql ($$$) {
     open P, "-|", @cmd or die $!;
     while (<P>) {
 	chomp or die;
-	printdebug("$debugprefix>|$_|\n");
+	printdebug(">|$_|\n");
 	push @rows, $_;
     }
     $!=0; $?=0; close P or failedcmd @cmd;
@@ -3056,7 +3073,7 @@ sub parseopts () {
 		     !$opts_opt_cmdonly{$1} &&
 		     ($om = $opts_opt_map{$1})) {
 		push @ropts, $_;
-		push @{ $opts_opt_cmdline_opts{$1} }, $2;
+		push @$om, $2;
 	    } elsif (m/^--existing-package=(.*)/s) {
 		push @ropts, $_;
 		$existing_package = $1;
@@ -3164,16 +3181,39 @@ sub parseopts () {
 }
 
 sub finalise_opts_opts () {
-    foreach my $k (keys %opts_opt_cmdline_opts) {
-	push @{ $opts_opt_map{$k} }, @{ $opts_opt_cmdline_opts{$k} };
+    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"