X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=ad460d14add2d9e696f9d10e416c784cbb4d8958;hp=7d2023e5c91ab266d3c94a81b9cd8f8ad5497c44;hb=5e83608976777bae7a99f0ea6cb3c97bb39253e8;hpb=c31333cd83a4262af8e54d96311d1368b66909cc

diff --git a/dgit b/dgit
index 7d2023e5..ad460d14 100755
--- a/dgit
+++ b/dgit
@@ -91,13 +91,14 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'sbuild' => \@sbuild,
                      'ssh' => \@ssh,
                      'dgit' => \@dgit,
+                     'git' => \@git,
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
                      'ch' => \@changesopts,
                      'mergechanges' => \@mergechanges);
 
-our %opts_opt_cmdonly = ('gpg' => 1);
+our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
 our %opts_cfg_insertpos = map {
     $_,
     scalar @{ $opts_opt_map{$_} }
@@ -422,7 +423,8 @@ our $helpmsg = <<END;
 main usages:
   dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
   dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
-  dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
+  dgit [dgit-opts] build [dpkg-buildpackage-opts]
+  dgit [dgit-opts] sbuild [sbuild-opts]
   dgit [dgit-opts] push [dgit-opts] [suite]
   dgit [dgit-opts] rpush build-host:build-dir ...
 important dgit options:
@@ -503,28 +505,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 {
@@ -686,6 +696,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/) {
@@ -976,7 +991,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;
@@ -1144,6 +1159,9 @@ sub check_for_git () {
 	my $url = "$prefix/$package$suffix";
 	my @cmd = (qw(curl -sS -I), $url);
 	my $result = cmdoutput @cmd;
+	$result =~ s/^\S+ 200 .*\n\r?\n//;
+	# curl -sS -I with https_proxy prints
+	# HTTP/1.0 200 Connection established
 	$result =~ m/^\S+ (404|200) /s or
 	    fail "unexpected results from git check query - ".
 	        Dumper($prefix, $result);
@@ -1201,14 +1219,7 @@ sub git_write_tree () {
     return $tree;
 }
 
-sub mktree_in_ud_from_only_subdir () {
-    # changes into the subdir
-    my (@dirs) = <*/.>;
-    die unless @dirs==1;
-    $dirs[0] =~ m#^([^/]+)/\.$# or die;
-    my $dir = $1;
-    changedir $dir;
-
+sub remove_stray_gits () {
     my @gitscmd = qw(find -name .git -prune -print0);
     debugcmd "|",@gitscmd;
     open GITS, "-|", @gitscmd or failedcmd @gitscmd;
@@ -1222,7 +1233,17 @@ sub mktree_in_ud_from_only_subdir () {
 	}
     }
     $!=0; $?=0; close GITS or failedcmd @gitscmd;
+}
+
+sub mktree_in_ud_from_only_subdir () {
+    # changes into the subdir
+    my (@dirs) = <*/.>;
+    die unless @dirs==1;
+    $dirs[0] =~ m#^([^/]+)/\.$# or die;
+    my $dir = $1;
+    changedir $dir;
 
+    remove_stray_gits();
     mktree_in_ud_here();
     my $format=get_source_format();
     if (madformat($format)) {
@@ -1625,7 +1646,10 @@ sub set_local_git_config ($$) {
     runcmd @git, qw(config), $k, $v;
 }
 
-sub setup_mergechangelogs () {
+sub setup_mergechangelogs (;$) {
+    my ($always) = @_;
+    return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
+
     my $driver = 'dpkg-mergechangelogs';
     my $cb = "merge.$driver";
     my $attrs = '.git/info/attributes';
@@ -1652,6 +1676,26 @@ sub setup_mergechangelogs () {
     rename "$attrs.new", "$attrs" or die "$attrs: $!";
 }
 
+sub setup_useremail (;$) {
+    my ($always) = @_;
+    return unless $always || access_cfg_bool(1, 'setup-useremail');
+
+    my $setup = sub {
+	my ($k, $envvar) = @_;
+	my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
+	return unless defined $v;
+	set_local_git_config "user.$k", $v;
+    };
+
+    $setup->('email', 'DEBEMAIL');
+    $setup->('name', 'DEBFULLNAME');
+}
+
+sub setup_new_tree () {
+    setup_mergechangelogs();
+    setup_useremail();
+}
+
 sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
@@ -1681,7 +1725,7 @@ sub clone ($) {
 	$vcsgiturl =~ s/\s+-b\s+\S+//g;
 	runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
-    setup_mergechangelogs();
+    setup_new_tree();
     runcmd @git, qw(reset --hard), lrref();
     printdone "ready for work in $dstdir";
 }
@@ -1833,6 +1877,9 @@ END
 	if (!defined $keyid) {
 	    $keyid = access_cfg('keyid','RETURN-UNDEF');
 	}
+        if (!defined $keyid) {
+	    $keyid = getfield $clogp, 'Maintainer';
+        }
 	unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
 	my @sign_cmd = (@gpg, qw(--detach-sign --armor));
 	push @sign_cmd, qw(-u),$keyid if defined $keyid;
@@ -2470,6 +2517,7 @@ sub quiltify ($$) {
     # should be contained within debian/patches.
 
     changedir '../fake';
+    remove_stray_gits();
     mktree_in_ud_here();
     rmtree '.pc';
     runcmd @git, 'add', '.';
@@ -2819,7 +2867,10 @@ sub quilt_fixup_editor () {
 
 #----- other building -----
 
+our $suppress_clean;
+
 sub clean_tree () {
+    return if $suppress_clean;
     if ($cleanmode eq 'dpkg-source') {
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
     } elsif ($cleanmode eq 'dpkg-source-d') {
@@ -2858,8 +2909,11 @@ sub build_prep () {
     build_maybe_quilt_fixup();
 }
 
-sub changesopts () {
+sub changesopts_initial () {
     my @opts =@changesopts[1..$#changesopts];
+}
+
+sub changesopts_version () {
     if (!defined $changes_since_version) {
 	my @vsns = archive_query('archive_query');
 	my @quirk = access_quirk();
@@ -2880,14 +2934,22 @@ sub changesopts () {
 	}
     }
     if ($changes_since_version ne '_') {
-	unshift @opts, "-v$changes_since_version";
+	return ("-v$changes_since_version");
+    } else {
+	return ();
     }
-    return @opts;
+}
+
+sub changesopts () {
+    return (changesopts_initial(), changesopts_version());
 }
 
 sub massage_dbp_args ($) {
     my ($cmd) = @_;
-    return unless $cleanmode =~ m/git|none/;
+    if ($cleanmode eq 'dpkg-source') {
+	$suppress_clean = 1;
+	return;
+    }
     debugcmd '#massaging#', @$cmd if $debuglevel>1;
     my @newcmd = shift @$cmd;
     # -nc has the side effect of specifying -b if nothing else specified
@@ -2900,20 +2962,26 @@ sub massage_dbp_args ($) {
 }
 
 sub cmd_build {
-    build_prep();
-    my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV);
+    my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     massage_dbp_args \@dbp;
+    build_prep();
+    push @dbp, changesopts_version();
     runcmd_ordryrun_local @dbp;
     printdone "build successful\n";
 }
 
-sub cmd_git_build {
-    build_prep();
+sub cmd_gbp_build {
     my @dbp = @dpkgbuildpackage;
     massage_dbp_args \@dbp;
     my @cmd =
 	(qw(git-buildpackage -us -uc --git-no-sign-tags),
 	 "--git-builder=@dbp");
+    if ($cleanmode eq 'dpkg-source') {
+	$suppress_clean = 1;
+    } else {
+	push @cmd, '--git-cleaner=true';
+    }
+    build_prep();
     unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
 	canonicalise_suite();
 	push @cmd, "--git-debian-branch=".lbranch();
@@ -2922,8 +2990,13 @@ sub cmd_git_build {
     runcmd_ordryrun_local @cmd, @ARGV;
     printdone "build successful\n";
 }
+sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
 
 sub build_source {
+    if ($cleanmode =~ m/^dpkg-source/) {
+	# dpkg-source will clean, so we shouldn't
+	$suppress_clean = 1;
+    }
     build_prep();
     $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
     $dscfn = dscfn($version);
@@ -3008,7 +3081,17 @@ sub cmd_clone_dgit_repos_server {
 
 sub cmd_setup_mergechangelogs {
     badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
-    setup_mergechangelogs();
+    setup_mergechangelogs(1);
+}
+
+sub cmd_setup_useremail {
+    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    setup_useremail(1);
+}
+
+sub cmd_setup_new_tree {
+    badusage "no arguments allowed to dgit setup-tree" if @ARGV;
+    setup_new_tree();
 }
 
 #---------- argument parsing and main program ----------
@@ -3179,30 +3262,28 @@ sub finalise_opts_opts () {
 	}
 
 	foreach my $c (access_cfg_cfgs("opts-$k")) {
-	    local ($debuglevel) = $debuglevel-2;
-	    my @cmd = (@git, qw(config -z --get-all), $c);
-	    my $vs = cmdoutput_errok @cmd;
-	    if ($?==0) {
-		badcfg "cannot configure options for $k"
-		    if $opts_opt_cmdonly{$k};
-		my $insertpos = $opts_cfg_insertpos{$k};
-		@$om = ( @$om[0..$insertpos-1],
-			 (split /\0/, $vs),
-			 @$om[$insertpos..$#$om] );
-	    } elsif ($?==256) {
-		die "$k $c ?" if length $vs;
-	    } else {
-		failedcmd @cmd;
-	    }
+	    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"