X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=b6d815870165667d72513da46194b0dea42c2dfc;hp=2e7df8e2862fd113e502e1193ca31d6a20ad22fd;hb=863475c001c7846fe4de4310f517207bd8178871;hpb=b944f517c8b2886ef3adda8bc1b72adacb243d29 diff --git a/dgit b/dgit index 2e7df8e2..b6d81587 100755 --- a/dgit +++ b/dgit @@ -24,11 +24,11 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use File::Temp qw(tempdir); use File::Basename; use Dpkg::Version; use POSIX; use IPC::Open2; -use File::Temp; our $our_version = 'UNRELEASED'; ###substituted### @@ -55,7 +55,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 +76,8 @@ our %opts_opt_map = ('dget' => \@dget, 'ch' => \@changesopts, 'mergechanges' => \@mergechanges); +our %opts_opt_cmdonly = ('gpg' => 1); + our $keyid; our $debug = 0; @@ -111,6 +113,9 @@ sub dscfn ($) { sub changesopts () { return @changesopts[1..$#changesopts]; } our $us = 'dgit'; +our $debugprefix = ' '; + +sub printdebug { print DEBUG $debugprefix, @_ or die $!; } sub fail { die "$us: @_\n"; } @@ -131,17 +136,17 @@ sub fetchspec () { # remote push initiator/responder protocol: # < dgit-remote-push-ready [optional extra info ignored by old initiators] # -# > file begin parsed-changelog +# > file parsed-changelog # [indicates that output of dpkg-parsechangelog follows] # > data-block NBYTES # > [NBYTES bytes of data (no newline)] # [maybe some more blocks] # > data-end # -# > file begin dsc +# > file dsc # [etc] # -# > file begin changes +# > file changes # [etc] # # > param head HEAD @@ -154,11 +159,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 @@ -170,12 +175,18 @@ 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"; - return if &$match; + if (wantarray) { + my @r = &$match; + return @r if @r; + } else { + my $r = &$match; + return $r if $r; + } badproto $fh, "\`$_'"; } @@ -207,11 +218,15 @@ sub protocol_receive_file ($$) { my ($fh, $ourfn) = @_; open PF, ">", $ourfn or die "$ourfn: $!"; for (;;) { - protocol_expect \*STDIN, { m/^data-block (.*})$|data-end$/ }; - length $1 or last; + my ($y,$l) = protocol_expect { + m/^data-block (.*})$|data-end$/; + length $1 ? (1,$1) : (0); + } \*STDIN; + last unless $y; my $d = protocol_read_bytes \*STDIN, $1; print PF $d or die $!; } + printdebug "received into $ourfn\n"; } #---------- remote protocol support, responder ---------- @@ -220,32 +235,34 @@ sub responder_send_command ($) { my ($command) = @_; return unless $we_are_responder; # called even without $we_are_responder - print DEBUG "<< $command\n"; + printdebug "<< $command\n"; print $command, "\n" or die $!; } sub responder_send_file ($$) { my ($keyword, $ourfn) = @_; return unless $we_are_responder; - responder_send_command "file-begin $keyword"; + printdebug "[[ $keyword $ourfn\n"; + responder_send_command "file $keyword"; protocol_send_file \*STDOUT, $ourfn; } sub responder_receive_files ($@) { my ($keyword, @ourfns) = @_; die unless $we_are_responder; + printdebug "]] $keyword @ourfns\n"; responder_send_command "want $keyword"; 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 ---------- @@ -288,13 +305,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 $!; } @@ -313,7 +330,7 @@ sub failedcmd { } sub runcmd { - printcmd(\*DEBUG,"+",@_) if $debug>0; + printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0; $!=0; $?=0; failedcmd @_ if system @_; } @@ -328,16 +345,16 @@ sub printdone { sub cmdoutput_errok { die Dumper(\@_)." ?" if grep { !defined } @_; - printcmd(\*DEBUG,"|",@_) if $debug>0; + printcmd(\*DEBUG,$debugprefix."|",@_) if $debug>0; open P, "-|", @_ or die $!; my $d; $!=0; $?=0; { local $/ = undef; $d =

; } die $! if P->error; - if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; } + if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; } chomp $d; $d =~ m/^.*/; - print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #'; + printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #'; return $d; } @@ -348,7 +365,7 @@ sub cmdoutput { } sub dryrun_report { - printcmd(\*STDERR,"#",@_); + printcmd(\*STDERR,$debugprefix."#",@_); } sub runcmd_ordryrun { @@ -370,6 +387,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 @@ -445,6 +463,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'); @@ -536,7 +572,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); } @@ -544,7 +580,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;". @@ -610,9 +646,9 @@ sub get_archive_dsc () { next; } my $dscfh = new IO::File \$dscdata, '<' or die $!; - print DEBUG Dumper($dscdata) if $debug>1; + printdebug Dumper($dscdata) if $debug>1; $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1); - print DEBUG Dumper($dsc) if $debug>1; + printdebug Dumper($dsc) if $debug>1; my $fmt = getfield $dsc, 'Format'; fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt}; return; @@ -625,7 +661,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; @@ -640,7 +676,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 { @@ -884,7 +920,7 @@ sub fetch_from_archive () { } else { die "$lrref_fn $!"; } - print DEBUG "previous reference hash=$lastpush_hash\n"; + printdebug "previous reference hash=$lastpush_hash\n"; my $hash; if (defined $dsc_hash) { fail "missing git history even though dsc has hash -". @@ -918,7 +954,7 @@ Package not found in the archive, but has allegedly been pushed using dgit. $later_warning_msg END } else { - print DEBUG "nothing found!\n"; + printdebug "nothing found!\n"; if (defined $skew_warning_vsn) { print STDERR <$clogf", @git, qw(cat-file blob), "$hash:debian/changelog"; my $gotclogp = parsechangelog("-l$clogf"); my $got_vsn = getfield $gotclogp, 'Version'; - print DEBUG "SKEW CHECK GOT $got_vsn\n"; + printdebug "SKEW CHECK GOT $got_vsn\n"; if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) { print STDERR <0; + printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>0; $!=0; $?=0; system @cmd; return if !$! && !$?; if (!$! && $?==256) { @@ -1069,7 +1105,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'; @@ -1095,6 +1131,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; @@ -1134,13 +1172,14 @@ 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; } } sub dopush () { - print DEBUG "actually entering push\n"; + printdebug "actually entering push\n"; prep_ud(); my $clogpfn = ".git/dgit/changelog.822.tmp"; @@ -1160,7 +1199,7 @@ sub dopush () { push_parse_dsc("../$dscfn", $dscfn, $cversion); my $format = getfield $dsc, 'Format'; - print DEBUG "format $format\n"; + printdebug "format $format\n"; if (madformat($format)) { commit_quilty_patch(); } @@ -1170,8 +1209,8 @@ sub dopush () { runcmd qw(dpkg-source -x --), "../../../../$dscfn"; my ($tree,$dir) = mktree_in_ud_from_only_subdir(); chdir '../../../..' or die $!; - printcmd \*DEBUG,"+",@_; my @diffcmd = (@git, qw(diff --exit-code), $tree); + printcmd \*DEBUG,$debugprefix."+",@diffcmd; $!=0; $?=0; if (system @diffcmd) { if ($! && $?==256) { @@ -1204,7 +1243,7 @@ sub dopush () { } } - responder_send_file('changes',$changesfn); + responder_send_file('changes',$changesfile); my $tfn = sub { ".git/dgit/tag$_[0]"; }; my ($tagobjfn) = @@ -1238,7 +1277,7 @@ sub dopush () { my $dryrunsuffix = $dryrun ? ".tmp" : ""; responder_receive_files('signed-dsc-changes', "../$dscfn$dryrunsuffix", - "$changesfile$dryrupnsuffix"); + "$changesfile$dryrunsuffix"); } else { sign_changes $changesfile; } @@ -1363,7 +1402,8 @@ sub cmd_remote_push_responder { die unless @rargs; my ($dir) = @rargs; chdir $dir or die "$dir: $!"; - $we_are_remote = 1; + $we_are_responder = 1; + $debugprefix = ' '; $|=1; responder_send_command("dgit-remote-push-ready"); &cmd_push; @@ -1396,20 +1436,23 @@ 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, qw(remote-push-responder), (scalar @rargs), @rargs; push @rdgit, @ARGV; my @cmd = (@ssh, $host, shellquote @rdgit); - my $pid = open2(\*RO, \*RI, @cmd); + printcmd \*DEBUG,$debugprefix."+",@cmd; eval { $i_tmp = tempdir(); + my $pid = open2(\*RO, \*RI, @cmd); chdir $i_tmp or die "$i_tmp $!"; initiator_expect { m/^dgit-remote-push-ready/ }; for (;;) { - initiator_expect { m/^(\S+)(?: (.*))?$/ }; - my ($icmd,$iargs) = ($1, $2); - i_method "i_resp_", $icmd, $iargs; + my ($icmd,$iargs) = initiator_expect { + m/^(\S+)(?: (.*))?$/; + ($1,$2); + }; + i_method "i_resp", $icmd, $iargs; } }; i_cleanup(); @@ -1429,7 +1472,7 @@ sub i_resp_complete { sub i_resp_file ($) { my ($keyword) = @_; - my $localname = i_method "i_localname_", $keyword; + my $localname = i_method "i_localname", $keyword; my $localpath = "$i_tmp/$localname"; stat $localpath and badproto \*RO, "file $keyword ($localpath) twice"; protocol_receive_file \*RO, $localpath; @@ -1446,7 +1489,9 @@ our %i_wanted; sub i_resp_want ($) { my ($keyword) = @_; - my @localpaths = i_method "i_want_", $keyword; + die "$keyword ?" if $i_wanted{$keyword}++; + my @localpaths = i_method "i_want", $keyword; + printdebug "]] $keyword @localpaths\n"; foreach my $localpath (@localpaths) { protocol_send_file \*RI, $localpath; } @@ -1461,7 +1506,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. ---------- @@ -1643,6 +1710,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; @@ -1667,6 +1741,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; @@ -1698,35 +1773,35 @@ sub parseopts () { } elsif (s/^-h/-/) { cmd_help(); } elsif (s/^-D/-/) { - push @ropts, $_; + push @ropts, $&; open DEBUG, ">&STDERR" or die $!; $debug++; } elsif (s/^-N/-/) { - push @ropts, $_; + push @ropts, $&; $new_package=1; } elsif (m/^-[vm]/) { - push @ropts, $_; + push @ropts, $&; push @changesopts, $_; $_ = ''; } elsif (s/^-c(.*=.*)//s) { - push @ropts, $_; + push @ropts, $&; push @git, '-c', $1; } elsif (s/^-d(.*)//s) { - push @ropts, $_; + push @ropts, $&; $idistro = $1; } elsif (s/^-C(.*)//s) { - push @ropts, $_; + push @ropts, $&; $changesfile = $1; } elsif (s/^-k(.*)//s) { $keyid=$1; } elsif (s/^-wn//s) { - push @ropts, $_; + push @ropts, $&; $cleanmode = 'none'; } elsif (s/^-wg//s) { - push @ropts, $_; + push @ropts, $&; $cleanmode = 'git'; } elsif (s/^-wd//s) { - push @ropts, $_; + push @ropts, $&; $cleanmode = 'dpkg-source'; } else { badusage "unknown short option \`$_'";