X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=448412e242f218c12a3c32f0ce5efb724d86d7c1;hp=9d2d8769974355e5fcd7135225295cbb589d1c87;hb=b250e873041896930e9e1d2f92df580f5eb91529;hpb=25f567819dab569d2f9bbe31626f32197b799e7d diff --git a/dgit b/dgit index 9d2d8769..448412e2 100755 --- a/dgit +++ b/dgit @@ -28,7 +28,6 @@ use File::Basename; use Dpkg::Version; use POSIX; use IPC::Open2; -use File::Temp; our $our_version = 'UNRELEASED'; ###substituted### @@ -55,7 +54,7 @@ our (@dput) = qw(dput); our (@debsign) = qw(debsign); our (@gpg) = qw(gpg); our (@sbuild) = qw(sbuild -A); -our (@ssh) = qw(ssh); +our (@ssh) = 'ssh'; our (@dgit) = qw(dgit); our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git); our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git); @@ -76,6 +75,8 @@ our %opts_opt_map = ('dget' => \@dget, 'ch' => \@changesopts, 'mergechanges' => \@mergechanges); +our %opts_opt_cmdonly = ('gpg' => 1); + our $keyid; our $debug = 0; @@ -144,6 +145,8 @@ sub fetchspec () { # > file begin changes # [etc] # +# > param head HEAD +# # > want signed-tag # [indicates that signed tag is wanted] # < data-block NBYTES @@ -152,11 +155,11 @@ sub fetchspec () { # < data-end # < files-end # -# > want signed-changes-dsc -# < data-block NBYTES [transfer of signed changes] -# [etc] +# > want signed-dsc-changes # < data-block NBYTES [transfer of signed dsc] # [etc] +# < data-block NBYTES [transfer of signed changes] +# [etc] # < files-end # # > complete @@ -168,8 +171,8 @@ sub badproto ($$) { fail "protocol violation; $m not expected"; } -sub protocol_expect ($&) { - my ($fh, $match) = @_; +sub protocol_expect (&$) { + my ($match, $fh) = @_; local $_; $_ = <$fh>; defined && chomp or badproto $fh, "eof"; @@ -205,7 +208,7 @@ sub protocol_receive_file ($$) { my ($fh, $ourfn) = @_; open PF, ">", $ourfn or die "$ourfn: $!"; for (;;) { - protocol_expect \*STDIN, { m/^data-block (.*})$|data-end$/ }; + protocol_expect { m/^data-block (.*})$|data-end$/ } \*STDIN; length $1 or last; my $d = protocol_read_bytes \*STDIN, $1; print PF $d or die $!; @@ -236,14 +239,14 @@ sub responder_receive_files ($@) { foreach my $fn (@ourfns) { protocol_receive_file \*STDIN, $fn; } - protocol_expect \*STDIN, { m/^files-end$/ }; + protocol_expect { m/^files-end$/ } \*STDIN; } #---------- remote protocol support, initiator ---------- sub initiator_expect (&) { my ($match) = @_; - protocol_expect \*RO, &$match; + protocol_expect { &$match } \*RO; } #---------- end remote code ---------- @@ -286,13 +289,13 @@ sub shellquote { push @out, $_; } } - return join '', @out; + return join ' ', @out; } sub printcmd { my $fh = shift @_; my $intro = shift @_; - print $fh $intro or die $!; + print $fh $intro," " or die $!; print $fh shellquote @_ or die $!; print $fh "\n" or die $!; } @@ -368,6 +371,7 @@ main usages: dgit [dgit-opts] fetch|pull [dgit-opts] [suite] dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts] dgit [dgit-opts] push [dgit-opts] [suite] + dgit [dgit-opts] rpush build-host:build-dir ... important dgit options: -k sign tag and package with instead of default --dry-run -n do not change anything, but go through the motions @@ -443,6 +447,24 @@ sub access_cfg (@) { return $value; } +sub string_to_ssh ($) { + my ($spec) = @_; + if ($spec =~ m/\s/) { + return qw(sh -ec), 'exec '.$spec.' "$@"', 'x'; + } else { + return ($spec); + } +} + +sub access_cfg_ssh () { + my $gitssh = access_cfg('ssh', 'RETURN-UNDEF'); + if (!defined $gitssh) { + return @ssh; + } else { + return string_to_ssh $gitssh; + } +} + sub access_someuserhost ($) { my ($some) = @_; my $user = access_cfg("$some-user",'username'); @@ -534,7 +556,7 @@ sub archive_query_sshdakls ($$) { my ($proto,$data) = @_; $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'"; my $dakls = cmdoutput - access_cfg('ssh'), $data, qw(dak ls -asource),"-s$isuite",$package; + access_cfg_ssh, $data, qw(dak ls -asource),"-s$isuite",$package; return madison_parse($dakls); } @@ -542,7 +564,7 @@ sub canonicalise_suite_sshdakls ($$) { my ($proto,$data) = @_; $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'"; my @cmd = - (access_cfg('ssh'), $`, + (access_cfg_ssh, $`, "set -e; cd $';". " if test -h $isuite; then readlink $isuite; exit 0; fi;". " if test -d $isuite; then echo $isuite; exit 0; fi;". @@ -623,7 +645,7 @@ sub check_for_git () { my $how = access_cfg('git-check'); if ($how eq 'ssh-cmd') { my @cmd = - (access_cfg('ssh'),access_gituserhost(), + (access_cfg_ssh, access_gituserhost(), " set -e; cd ".access_cfg('git-path').";". " if test -d $package.git; then echo 1; else echo 0; fi"); my $r= cmdoutput @cmd; @@ -638,7 +660,7 @@ sub create_remote_git_repo () { my $how = access_cfg('git-create'); if ($how eq 'ssh-cmd') { runcmd_ordryrun - (access_cfg('ssh'),access_gituserhost(), + (access_cfg_ssh, access_gituserhost(), "set -e; cd ".access_cfg('git-path').";". " cp -a _template $package.git"); } else { @@ -1067,7 +1089,7 @@ sub push_parse_changelog ($) { return ($clogp, $cversion, $tag, $dscfn); } -sub push_parse_dsc ($$) { +sub push_parse_dsc ($$$) { my ($dscfn,$dscfnwhat, $cversion) = @_; $dsc = parsecontrol($dscfn,$dscfnwhat); my $dversion = getfield $dsc, 'Version'; @@ -1093,6 +1115,8 @@ sub push_mktag ($$$$$$$$) { " does not match changelog \`$clogp->{$field}'"; } + my $cversion = getfield $clogp, 'Version'; + # We make the git tag by hand because (a) that makes it easier # to control the "tagger" (b) we can do remote signing my $authline = clogp_authline $clogp; @@ -1132,6 +1156,7 @@ sub sign_changes ($) { if ($sign) { my @debsign_cmd = @debsign; push @debsign_cmd, "-k$keyid" if defined $keyid; + push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg'; push @debsign_cmd, $changesfile; runcmd_ordryrun @debsign_cmd; } @@ -1202,7 +1227,7 @@ sub dopush () { } } - responder_send_file('changes',$changesfn); + responder_send_file('changes',$changesfile); my $tfn = sub { ".git/dgit/tag$_[0]"; }; my ($tagobjfn) = @@ -1236,7 +1261,7 @@ sub dopush () { my $dryrunsuffix = $dryrun ? ".tmp" : ""; responder_receive_files('signed-dsc-changes', "../$dscfn$dryrunsuffix", - "$changesfile$dryrupnsuffix"); + "$changesfile$dryrunsuffix"); } else { sign_changes $changesfile; } @@ -1361,7 +1386,7 @@ sub cmd_remote_push_responder { die unless @rargs; my ($dir) = @rargs; chdir $dir or die "$dir: $!"; - $we_are_remote = 1; + $we_are_responder = 1; $|=1; responder_send_command("dgit-remote-push-ready"); &cmd_push; @@ -1394,7 +1419,7 @@ sub cmd_rpush { $dir =~ s{^-}{./-}; my @rargs = ($dir); my @rdgit; - push @rdgit, @dgit + push @rdgit, @dgit; push @rdgit, @ropts; push @rdgit, (scalar @rargs), @rargs; push @rdgit, @ARGV; @@ -1433,8 +1458,18 @@ sub i_resp_file ($) { protocol_receive_file \*RO, $localpath; } +our %i_param; + +sub i_param ($) { + $_[0] =~ m/^(\S+) (.*)$/; + $i_param{$1} = $2; +} + +our %i_wanted; + sub i_resp_want ($) { my ($keyword) = @_; + die "$keyword ?" if $i_wanted{$keyword}++; my @localpaths = i_method "i_want_", $keyword; foreach my $localpath (@localpaths) { protocol_send_file \*RI, $localpath; @@ -1450,7 +1485,29 @@ sub i_localname_dsc { ($i_clogp, $i_version, $i_tag, $i_dscfn) = push_parse_changelog 'remote-changelog.822'; die if $i_dscfn =~ m#/|^\W#; - return $dscfn; + return $i_dscfn; +} + +sub i_want_signed_tag { + defined $i_param{'head'} && defined $i_dscfn + or badproto \*RO, "sequencing error"; + my $head = $i_param{'head'}; + die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../; + + push_parse_dsc $i_dscfn, 'remote dsc', + + push_mktag $head, $i_clogp, $i_tag, + $dsc, $i_dscfn, + 'remote.changes', 'remote changes', + 'tag.tag'; + + return 'tag.tag'; +} + +sub i_want_signed_dsc_changes { + rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!"; + sign_changes 'remote.changes'; + return ($i_dscfn, 'remote.changes'); } #---------- building etc. ---------- @@ -1632,6 +1689,13 @@ sub cmd_version { sub parseopts () { my $om; + + if (defined $ENV{'DGIT_SSH'}) { + @ssh = string_to_ssh $ENV{'DGIT_SSH'}; + } elsif (defined $ENV{'GIT_SSH'}) { + @ssh = ($ENV{'GIT_SSH'}); + } + while (@ARGV) { last unless $ARGV[0] =~ m/^-/; $_ = shift @ARGV; @@ -1656,6 +1720,7 @@ sub parseopts () { push @ropts, $_; $om->[0] = $2; } elsif (m/^--(\w+):(.*)/s && + !$opts_opt_cmdonly{$1} && ($om = $opts_opt_map{$1})) { push @ropts, $_; push @$om, $2;