X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;fp=dgit;h=e46da88a00d4e8906722d4a288bd32e3a5061b94;hp=ba5f1ba8295c6b8d176411eddf3599d3786ea73b;hb=59235957912b6f55e150d533749aad62b1647e8e;hpb=f5cc5221e5f7298d88c384af112b33a3287a2a1a diff --git a/dgit b/dgit index ba5f1ba8..e46da88a 100755 --- a/dgit +++ b/dgit @@ -24,15 +24,18 @@ 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; our $our_version = 'UNRELEASED'; ###substituted### our $isuite = 'unstable'; our $idistro; our $package; +our @ropts; our $sign = 1; our $dryrun = 0; @@ -42,6 +45,7 @@ our $ignoredirty = 0; our $noquilt = 0; our $existing_package = 'dpkg'; our $cleanmode = 'dpkg-source'; +our $we_are_responder; our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -49,7 +53,10 @@ our (@git) = qw(git); our (@dget) = qw(dget); our (@dput) = qw(dput); our (@debsign) = qw(debsign); +our (@gpg) = qw(gpg); our (@sbuild) = qw(sbuild -A); +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); our (@dpkggenchanges) = qw(dpkg-genchanges); @@ -59,13 +66,18 @@ our (@changesopts) = (''); our %opts_opt_map = ('dget' => \@dget, 'dput' => \@dput, 'debsign' => \@debsign, + 'gpg' => \@gpg, 'sbuild' => \@sbuild, + 'ssh' => \@ssh, + 'dgit' => \@dgit, 'dpkg-source' => \@dpkgsource, 'dpkg-buildpackage' => \@dpkgbuildpackage, 'dpkg-genchanges' => \@dpkggenchanges, 'ch' => \@changesopts, 'mergechanges' => \@mergechanges); +our %opts_opt_cmdonly = ('gpg' => 1); + our $keyid; our $debug = 0; @@ -103,6 +115,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"; } @@ -118,6 +133,152 @@ sub fetchspec () { return "+".rrref().":".lrref(); } +#---------- remote protocol support, common ---------- + +# remote push initiator/responder protocol: +# < dgit-remote-push-ready [optional extra info ignored by old initiators] +# +# > 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 dsc +# [etc] +# +# > file changes +# [etc] +# +# > param head HEAD +# +# > want signed-tag +# [indicates that signed tag is wanted] +# < data-block NBYTES +# < [NBYTES bytes of data (no newline)] +# [maybe some more blocks] +# < data-end +# < files-end +# +# > want signed-dsc-changes +# < data-block NBYTES [transfer of signed dsc] +# [etc] +# < data-block NBYTES [transfer of signed changes] +# [etc] +# < files-end +# +# > complete + +sub badproto ($$) { + my ($fh, $m) = @_; + fail "connection lost: $!" if $fh->error; + fail "connection terminated" if $fh->eof; + fail "protocol violation; $m not expected"; +} + +sub protocol_expect (&$) { + my ($match, $fh) = @_; + local $_; + $_ = <$fh>; + defined && chomp or badproto $fh, "eof"; + if (wantarray) { + my @r = &$match; + return @r if @r; + } else { + my $r = &$match; + return $r if $r; + } + badproto $fh, "\`$_'"; +} + +sub protocol_send_file ($$) { + my ($fh, $ourfn) = @_; + open PF, "<", $ourfn or die "$ourfn: $!"; + for (;;) { + my $d; + my $got = read PF, $d, 65536; + die "$ourfn: $!" unless defined $got; + last if $got; + print $fh "data-block ".length($d)."\n" or die $!; + print $d or die $!; + } + print $fh "data-end\n" or die $!; + close PF; +} + +sub protocol_read_bytes ($$) { + my ($fh, $nbytes) = @_; + $nbytes =~ m/^\d{1,6}$/ or badproto \*RO, "bad byte count"; + my $d; + my $got = read $fh, $d, $nbytes; + $got==$nbytes or badproto $fh, "eof during data block"; + return $d; +} + +sub protocol_receive_file ($$) { + my ($fh, $ourfn) = @_; + open PF, ">", $ourfn or die "$ourfn: $!"; + for (;;) { + 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 ---------- + +sub responder_send_command ($) { + my ($command) = @_; + return unless $we_are_responder; + # called even without $we_are_responder + printdebug "<< $command\n"; + print $command, "\n" or die $!; +} + +sub responder_send_file ($$) { + my ($keyword, $ourfn) = @_; + return unless $we_are_responder; + 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 { m/^files-end$/ } \*STDIN; +} + +#---------- remote protocol support, initiator ---------- + +sub initiator_expect (&) { + my ($match) = @_; + protocol_expect { &$match } \*RO; +} + +#---------- end remote code ---------- + +sub progress { + if ($we_are_responder) { + my $m = join '', @_; + responder_send_command "progress ".length($m) or die $!; + print $m or die $!; + } else { + print @_, "\n"; + } +} + our $ua; sub url_get { @@ -126,7 +287,7 @@ sub url_get { $ua->env_proxy; } my $what = $_[$#_]; - print "downloading $what...\n"; + progress "downloading $what..."; my $r = $ua->get(@_) or die $!; return undef if $r->code == 404; $r->is_success or fail "failed to fetch $what: ".$r->status_line; @@ -135,19 +296,25 @@ sub url_get { our ($dscdata,$dscurl,$dsc,$skew_warning_vsn); -sub printcmd { - my $fh = shift @_; - my $intro = shift @_; - print $fh $intro or die $!; +sub shellquote { + my @out; local $_; foreach my $a (@_) { $_ = $a; if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) { - print $fh " '$_'" or die $!; + push @out, "'$_'"; } else { - print $fh " $_" or die $!; + push @out, $_; } } + return join ' ', @out; +} + +sub printcmd { + my $fh = shift @_; + my $intro = shift @_; + print $fh $intro," " or die $!; + print $fh shellquote @_ or die $!; print $fh "\n" or die $!; } @@ -165,31 +332,31 @@ sub failedcmd { } sub runcmd { - printcmd(\*DEBUG,"+",@_) if $debug>0; + printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0; $!=0; $?=0; failedcmd @_ if system @_; } sub printdone { if (!$dryrun) { - print "dgit ok: @_\n"; + progress "dgit ok: @_"; } else { - print "would be ok: @_ (but dry run only)\n"; + progress "would be ok: @_ (but dry run only)"; } } 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; } @@ -200,7 +367,7 @@ sub cmdoutput { } sub dryrun_report { - printcmd(\*STDOUT,"#",@_); + printcmd(\*STDERR,$debugprefix."#",@_); } sub runcmd_ordryrun { @@ -230,6 +397,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 @@ -248,6 +416,11 @@ sub badusage { exit 8; } +sub nextarg { + @ARGV or badusage "too few arguments"; + return scalar shift @ARGV; +} + sub cmd_help () { print $helpmsg or die $!; exit 0; @@ -301,6 +474,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'); @@ -392,7 +583,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); } @@ -400,7 +591,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;". @@ -450,7 +641,7 @@ sub canonicalise_suite () { $csuite = archive_query('canonicalise_suite'); if ($isuite ne $csuite) { # madison canonicalises for us - print "canonical suite name for $isuite is $csuite\n"; + progress "canonical suite name for $isuite is $csuite"; } } @@ -466,9 +657,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; @@ -481,7 +672,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; @@ -496,7 +687,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 { @@ -573,6 +764,18 @@ sub make_commit ($) { return cmdoutput @git, qw(hash-object -w -t commit), $file; } +sub clogp_authline ($) { + my ($clogp) = @_; + my $author = getfield $clogp, 'Maintainer'; + $author =~ s#,.*##ms; + my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date'); + my $authline = "$author $date"; + $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or + fail "unexpected commit author line format \`$authline'". + " (was generated from changelog Maintainer field)"; + return $authline; +} + sub generate_commit_from_dsc () { prep_ud(); chdir $ud or die $!; @@ -593,13 +796,7 @@ sub generate_commit_from_dsc () { my ($tree,$dir) = mktree_in_ud_from_only_subdir(); runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; my $clogp = parsecontrol('../changelog.tmp',"commit's changelog"); - my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date'); - my $author = getfield $clogp, 'Maintainer'; - $author =~ s#,.*##ms; - my $authline = "$author $date"; - $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or - fail "unexpected commit author line format \`$authline'". - " (was generated from changelog Maintainer field)"; + my $authline = clogp_authline $clogp; my $changes = getfield $clogp, 'Changes'; open C, ">../commit.tmp" or die $!; print C <>../changelogold.tmp'; @@ -669,7 +866,7 @@ sub ensure_we_have_orig () { fail "existing file $f has hash $got but .dsc". " demands hash $fi->{Hash}". " (perhaps you should delete this file?)"; - print "using existing $f\n"; + progress "using existing $f"; next; } else { die "$f $!" unless $!==&ENOENT; @@ -716,12 +913,12 @@ sub fetch_from_archive () { if (defined $dsc_hash) { $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'"; $dsc_hash = $&; - print "last upload to archive specified git hash\n"; + progress "last upload to archive specified git hash"; } else { - print "last upload to archive has NO git hash\n"; + progress "last upload to archive has NO git hash"; } } else { - print "no version available from the archive\n"; + progress "no version available from the archive"; } my $lrref_fn = ".git/".lrref(); @@ -734,7 +931,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 -". @@ -768,7 +965,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) { @@ -878,55 +1075,148 @@ sub commit_quilty_patch () { } } if (!%adds) { - print "nothing quilty to commit, ok.\n"; + progress "nothing quilty to commit, ok."; return; } runcmd_ordryrun_local @git, qw(add), sort keys %adds; my $m = "Commit Debian 3.0 (quilt) metadata"; - print "$m\n"; + progress "$m"; runcmd_ordryrun_local @git, qw(commit -m), $m; } sub madformat ($) { my ($format) = @_; return 0 unless $format eq '3.0 (quilt)'; - print "Format \`$format', urgh\n"; + progress "Format \`$format', urgh"; if ($noquilt) { - print "Not doing any fixup of \`$format' due to --no-quilt-fixup"; + progress "Not doing any fixup of \`$format' due to --no-quilt-fixup"; return 0; } return 1; } -sub dopush () { - print DEBUG "actually entering push\n"; - my $clogp = parsechangelog(); +sub push_parse_changelog ($) { + my ($clogpfn) = @_; + + my $clogp = Dpkg::Control::Hash->new(); + $clogp->load($clogpfn); + $package = getfield $clogp, 'Source'; my $cversion = getfield $clogp, 'Version'; + my $tag = debiantag($cversion); + runcmd @git, qw(check-ref-format), $tag; + my $dscfn = dscfn($cversion); - stat "../$dscfn" or - fail "looked for .dsc $dscfn, but $!;". - " maybe you forgot to build"; - $dsc = parsecontrol("../$dscfn","$dscfn"); - my $dscpackage = getfield $dsc, 'Source'; - my $format = getfield $dsc, 'Format'; + + return ($clogp, $cversion, $tag, $dscfn); +} + +sub push_parse_dsc ($$$) { + my ($dscfn,$dscfnwhat, $cversion) = @_; + $dsc = parsecontrol($dscfn,$dscfnwhat); my $dversion = getfield $dsc, 'Version'; + my $dscpackage = getfield $dsc, 'Source'; ($dscpackage eq $package && $dversion eq $cversion) or fail "$dsc is for $dscpackage $dversion". " but debian/changelog is for $package $cversion"; - print DEBUG "format $format\n"; +} + +sub push_mktag ($$$$$$$$) { + my ($head,$clogp,$tag, + $dsc,$dscfn, + $changesfile,$changesfilewhat, + $tfn) = @_; + + $dsc->{$ourdscfield[0]} = $head; + $dsc->save("$dscfn.tmp") or die $!; + + my $changes = parsecontrol($changesfile,$changesfilewhat); + foreach my $field (qw(Source Distribution Version)) { + $changes->{$field} eq $clogp->{$field} or + fail "changes field $field \`$changes->{$field}'". + " 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; + open TO, '>', $tfn->('.tmp') or die $!; + print TO <('.tmp'); + if ($sign) { + if (!defined $keyid) { + $keyid = access_cfg('keyid','RETURN-UNDEF'); + } + 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; + push @sign_cmd, $tfn->('.tmp'); + runcmd_ordryrun @sign_cmd; + if (!$dryrun) { + $tagobjfn = $tfn->('.signed.tmp'); + runcmd shell_cmd "exec >$tagobjfn", qw(cat --), + $tfn->('.tmp'), $tfn->('.tmp.asc'); + } + } + + return ($tagobjfn); +} + +sub sign_changes ($) { + my ($changesfile) = @_; + 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 () { + printdebug "actually entering push\n"; + prep_ud(); + + my $clogpfn = ".git/dgit/changelog.822.tmp"; + runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog); + + responder_send_file('parsed-changelog', $clogpfn); + + my ($clogp, $cversion, $tag, $dscfn) = + push_parse_changelog("$clogpfn"); + + stat "../$dscfn" or + fail "looked for .dsc $dscfn, but $!;". + " maybe you forgot to build"; + + responder_send_file('dsc', "../$dscfn"); + + push_parse_dsc("../$dscfn", $dscfn, $cversion); + + my $format = getfield $dsc, 'Format'; + printdebug "format $format\n"; if (madformat($format)) { commit_quilty_patch(); } check_not_dirty(); - prep_ud(); chdir $ud or die $!; - print "checking that $dscfn corresponds to HEAD\n"; + progress "checking that $dscfn corresponds to HEAD"; 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) { @@ -942,8 +1232,7 @@ sub dopush () { # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git", # map { lref($_).":".rref($_) } # (uploadbranch()); - $dsc->{$ourdscfield[0]} = rev_parse('HEAD'); - $dsc->save("../$dscfn.tmp") or die $!; + my $head = rev_parse('HEAD'); if (!$changesfile) { my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes"; if (stat "$multi") { @@ -959,45 +1248,53 @@ sub dopush () { ($changesfile) = @cs; } } - my $changes = parsecontrol($changesfile,$changesfile); - foreach my $field (qw(Source Distribution Version)) { - $changes->{$field} eq $clogp->{$field} or - fail "changes field $field \`$changes->{$field}'". - " does not match changelog \`$clogp->{$field}'"; - } - my $tag = debiantag($dversion); + + responder_send_file('changes',$changesfile); + + my $tfn = sub { ".git/dgit/tag$_[0]"; }; + my ($tagobjfn) = + $we_are_responder + ? responder_receive_files('signed-tag', $tfn->('.signed.tmp')) + : push_mktag($head,$clogp,$tag, + $dsc,"../$dscfn", + $changesfile,$changesfile, + $tfn); + + my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn; + runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash; + runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash; + runcmd_ordryrun @git, qw(tag -v --), $tag; + if (!check_for_git()) { create_remote_git_repo(); } runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref(); runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD'; - if (!$dryrun) { - rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; - } else { - print "[new .dsc left in $dscfn.tmp]\n"; - } - if ($sign) { - if (!defined $keyid) { - $keyid = access_cfg('keyid','RETURN-UNDEF'); - } - my @tag_cmd = (@git, qw(tag -m), - "$package release $dversion for $csuite [dgit]"); - if ($dryrun != 1) { - push @tag_cmd, qw(-s); - push @tag_cmd, qw(-u),$keyid if defined $keyid; + + if (!$we_are_responder) { + if ($dryrun <= 1) { + rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; + } else { + progress "[new .dsc left in $dscfn.tmp]"; } - push @tag_cmd, $tag; - runcmd_ordryrun_local @tag_cmd; - my @debsign_cmd = @debsign; - push @debsign_cmd, "-k$keyid" if defined $keyid; - push @debsign_cmd, $changesfile; - runcmd_ordryrun @debsign_cmd; } + + if ($we_are_responder) { + my $dryrunsuffix = $dryrun > 1 ? ".tmp" : ""; + responder_receive_files('signed-dsc-changes', + "../$dscfn$dryrunsuffix", + "$changesfile$dryrunsuffix"); + } else { + sign_changes $changesfile; + } + runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag"; my $host = access_cfg('upload-host','RETURN-UNDEF'); my @hostarg = defined($host) ? ($host,) : (); runcmd_ordryrun @dput, @hostarg, $changesfile; - printdone "pushed and uploaded $dversion"; + printdone "pushed and uploaded $cversion"; + + responder_send_command("complete"); } sub cmd_clone { @@ -1041,7 +1338,7 @@ sub fetchpullargs () { $isuite = getfield $clogp, 'Distribution'; } canonicalise_suite(); - print "fetching from suite $csuite\n"; + progress "fetching from suite $csuite"; } elsif (@ARGV==1) { ($isuite) = @ARGV; canonicalise_suite(); @@ -1068,15 +1365,24 @@ sub cmd_push { check_not_dirty(); my $clogp = parsechangelog(); $package = getfield $clogp, 'Source'; + my $specsuite; if (@ARGV==0) { - $isuite = getfield $clogp, 'Distribution'; - if ($new_package) { - local ($package) = $existing_package; # this is a hack - canonicalise_suite(); - } + } elsif (@ARGV==1) { + ($specsuite) = (@ARGV); } else { badusage "incorrect arguments to dgit push"; } + $isuite = getfield $clogp, 'Distribution'; + if ($new_package) { + local ($package) = $existing_package; # this is a hack + canonicalise_suite(); + } + if (defined $specsuite && $specsuite ne $isuite) { + canonicalise_suite(); + $csuite eq $specsuite or + fail "dgit push: changelog specifies $isuite ($csuite)". + " but command line specifies $specsuite"; + } if (check_for_git()) { git_fetch_us(); } @@ -1093,6 +1399,146 @@ sub cmd_push { dopush(); } +#---------- remote commands' implementation ---------- + +sub cmd_remote_push_responder { + my ($nrargs) = shift @ARGV; + my (@rargs) = @ARGV[0..$nrargs-1]; + @ARGV = @ARGV[$nrargs..$#ARGV]; + die unless @rargs; + my ($dir) = @rargs; + chdir $dir or die "$dir: $!"; + $we_are_responder = 1; + $debugprefix = ' '; + autoflush STDOUT 1; + responder_send_command("dgit-remote-push-ready"); + &cmd_push; +} + +our $i_tmp; + +sub i_cleanup { + local ($@); + return unless defined $i_tmp; + chdir "/" or die $!; + eval { rmtree $i_tmp; }; +} + +sub i_method { + my ($base,$selector,@args) = @_; + $selector =~ s/\-/_/g; + { no strict qw(refs); &{"${base}_${selector}"}(@args); } +} + +sub cmd_rpush { + my $host = nextarg; + my $dir; + if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) { + $host = $1; + $dir = $'; #'; + } else { + $dir = nextarg; + } + $dir =~ s{^-}{./-}; + my @rargs = ($dir); + my @rdgit; + push @rdgit, @dgit; + push @rdgit, @ropts; + push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs; + push @rdgit, @ARGV; + my @cmd = (@ssh, $host, shellquote @rdgit); + 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 (;;) { + my ($icmd,$iargs) = initiator_expect { + m/^(\S+)(?: (.*))?$/; + ($1,$2); + }; + i_method "i_resp", $icmd, $iargs; + } + }; + i_cleanup(); + die $@; +} + +sub i_resp_progress ($) { + my ($rhs) = @_; + my $msg = protocol_read_bytes \*RO, $rhs; + progress $msg; +} + +sub i_resp_complete { + i_cleanup(); + exit 0; +} + +sub i_resp_file ($) { + my ($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; +} + +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; + printdebug "]] $keyword @localpaths\n"; + foreach my $localpath (@localpaths) { + protocol_send_file \*RI, $localpath; + } + print RI "end-files\n" or die $!; +} + +our ($i_clogp, $i_version, $i_tag, $i_dscfn); + +sub i_localname_parsed_changelog { return "remote-changelog.822"; } +sub i_localname_changes { return "remote.changes"; } +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 $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. ---------- + our $version; our $sourcechanges; our $dscfn; @@ -1262,6 +1708,8 @@ sub cmd_quilt_fixup { build_maybe_quilt_fixup(); } +#---------- argument parsing and main program ---------- + sub cmd_version { print "dgit version $our_version\n" or die $!; exit 0; @@ -1269,41 +1717,60 @@ 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; last if m/^--?$/; if (m/^--/) { if (m/^--dry-run$/) { + push @ropts, $_; $dryrun=2; } elsif (m/^--damp-run$/) { + push @ropts, $_; $dryrun=1; } elsif (m/^--no-sign$/) { + push @ropts, $_; $sign=0; } elsif (m/^--help$/) { cmd_help(); } elsif (m/^--version$/) { cmd_version(); } elsif (m/^--new$/) { + push @ropts, $_; $new_package=1; } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1}) && length $om->[0]) { + push @ropts, $_; $om->[0] = $2; } elsif (m/^--(\w+):(.*)/s && + !$opts_opt_cmdonly{$1} && ($om = $opts_opt_map{$1})) { + push @ropts, $_; push @$om, $2; } elsif (m/^--existing-package=(.*)/s) { + push @ropts, $_; $existing_package = $1; } elsif (m/^--distro=(.*)/s) { + push @ropts, $_; $idistro = $1; } elsif (m/^--clean=(dpkg-source|git|none)$/s) { + push @ropts, $_; $cleanmode = $1; } elsif (m/^--clean=(.*)$/s) { badusage "unknown cleaning mode \`$1'"; } elsif (m/^--ignore-dirty$/s) { + push @ropts, $_; $ignoredirty = 1; } elsif (m/^--no-quilt-fixup$/s) { + push @ropts, $_; $noquilt = 1; } else { badusage "unknown long option \`$_'"; @@ -1311,32 +1778,44 @@ sub parseopts () { } else { while (m/^-./s) { if (s/^-n/-/) { + push @ropts, $&; $dryrun=2; } elsif (s/^-L/-/) { + push @ropts, $&; $dryrun=1; } elsif (s/^-h/-/) { cmd_help(); } elsif (s/^-D/-/) { + push @ropts, $&; open DEBUG, ">&STDERR" or die $!; + autoflush DEBUG 1; $debug++; } elsif (s/^-N/-/) { + push @ropts, $&; $new_package=1; } elsif (m/^-[vm]/) { + push @ropts, $&; push @changesopts, $_; $_ = ''; } elsif (s/^-c(.*=.*)//s) { + push @ropts, $&; push @git, '-c', $1; } elsif (s/^-d(.*)//s) { + push @ropts, $&; $idistro = $1; } elsif (s/^-C(.*)//s) { + push @ropts, $&; $changesfile = $1; } elsif (s/^-k(.*)//s) { $keyid=$1; } elsif (s/^-wn//s) { + push @ropts, $&; $cleanmode = 'none'; } elsif (s/^-wg//s) { + push @ropts, $&; $cleanmode = 'git'; } elsif (s/^-wd//s) { + push @ropts, $&; $cleanmode = 'dpkg-source'; } else { badusage "unknown short option \`$_'";