X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=254e3fbf5f588bc1f1bc6a7c20f41492cdd09ab2;hp=b1ed90447748bb25d95f75f9575badc26e00aa08;hb=6e24ac7bb85e30df00b3d14853b049e3f06b6dec;hpb=41e0ec2b26cba9b3d4016b195ec8795ca1bd40f4 diff --git a/dgit b/dgit index b1ed9044..254e3fbf 100755 --- a/dgit +++ b/dgit @@ -45,7 +45,9 @@ our $ignoredirty = 0; our $noquilt = 0; our $existing_package = 'dpkg'; our $cleanmode = 'dpkg-source'; +our $changes_since_version; our $we_are_responder; +our $initiator_tempdir; our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -112,14 +114,14 @@ sub dscfn ($) { return "${package}_".(stripepoch $vsn).".dsc"; } -sub changesopts () { return @changesopts[1..$#changesopts]; } - our $us = 'dgit'; -our $debugprefix = ' '; +our $debugprefix = ''; sub printdebug { print DEBUG $debugprefix, @_ or die $!; } -sub fail { die "$us: @_\n"; } +sub fail { + die $us.($we_are_responder ? " (build host)" : "").": @_\n"; +} sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; } @@ -133,6 +135,12 @@ sub fetchspec () { return "+".rrref().":".lrref(); } +sub changedir ($) { + my ($newdir) = @_; + printdebug "CD $newdir\n"; + chdir $newdir or die "chdir: $newdir: $!"; +} + #---------- remote protocol support, common ---------- # remote push initiator/responder protocol: @@ -173,7 +181,6 @@ sub fetchspec () { sub badproto ($$) { my ($fh, $m) = @_; fail "connection lost: $!" if $fh->error; - fail "connection terminated" if $fh->eof; fail "protocol violation; $m not expected"; } @@ -199,17 +206,18 @@ sub protocol_send_file ($$) { my $d; my $got = read PF, $d, 65536; die "$ourfn: $!" unless defined $got; - last if $got; + last if !$got; print $fh "data-block ".length($d)."\n" or die $!; - print $d or die $!; + print $fh $d or die $!; } + PF->error and die "$ourfn $!"; 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"; + $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count"; my $d; my $got = read $fh, $d, $nbytes; $got==$nbytes or badproto $fh, "eof during data block"; @@ -218,17 +226,19 @@ sub protocol_read_bytes ($$) { sub protocol_receive_file ($$) { my ($fh, $ourfn) = @_; + printdebug "() $ourfn\n"; open PF, ">", $ourfn or die "$ourfn: $!"; for (;;) { my ($y,$l) = protocol_expect { - m/^data-block (.*})$|data-end$/; - length $1 ? (1,$1) : (0); - } \*STDIN; + m/^data-block (.*)$/ ? (1,$1) : + m/^data-end$/ ? (0,) : + (); + } $fh; last unless $y; - my $d = protocol_read_bytes \*STDIN, $1; + my $d = protocol_read_bytes $fh, $l; print PF $d or die $!; } - printdebug "received into $ourfn\n"; + close PF or die $!; } #---------- remote protocol support, responder ---------- @@ -237,27 +247,28 @@ 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 $!; + printdebug ">> $command\n"; + print PO $command, "\n" or die $!; } sub responder_send_file ($$) { my ($keyword, $ourfn) = @_; return unless $we_are_responder; - printdebug "[[ $keyword $ourfn\n"; + printdebug "]] $keyword $ourfn\n"; responder_send_command "file $keyword"; - protocol_send_file \*STDOUT, $ourfn; + protocol_send_file \*PO, $ourfn; } sub responder_receive_files ($@) { my ($keyword, @ourfns) = @_; die unless $we_are_responder; - printdebug "]] $keyword @ourfns\n"; + printdebug "[[ $keyword @ourfns\n"; responder_send_command "want $keyword"; foreach my $fn (@ourfns) { - protocol_receive_file \*STDIN, $fn; + protocol_receive_file \*PI, $fn; } - protocol_expect { m/^files-end$/ } \*STDIN; + printdebug "[[\$\n"; + protocol_expect { m/^files-end$/ } \*PI; } #---------- remote protocol support, initiator ---------- @@ -273,7 +284,7 @@ sub progress { if ($we_are_responder) { my $m = join '', @_; responder_send_command "progress ".length($m) or die $!; - print $m or die $!; + print PO $m or die $!; } else { print @_, "\n"; } @@ -714,7 +725,7 @@ sub mktree_in_ud_from_only_subdir () { die unless @dirs==1; $dirs[0] =~ m#^([^/]+)/\.$# or die; my $dir = $1; - chdir $dir or die "$dir $!"; + changedir $dir; fail "source package contains .git directory" if stat '.git'; die $! unless $!==&ENOENT; runcmd qw(git init -q); @@ -781,7 +792,7 @@ sub clogp_authline ($) { sub generate_commit_from_dsc () { prep_ud(); - chdir $ud or die $!; + changedir $ud; my @files; foreach my $f (dsc_files()) { die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#; @@ -847,7 +858,7 @@ END $outputhash = $lastpush_hash; } } - chdir '../../../..' or die $!; + changedir '../../../..'; runcmd @git, qw(update-ref -m),"dgit fetch import $cversion", 'DGIT_ARCHIVE', $outputhash; cmdoutput @git, qw(log -n2), $outputhash; @@ -1021,7 +1032,7 @@ sub clone ($) { canonicalise_suite(); badusage "dry run makes no sense with clone" unless act_local(); mkdir $dstdir or die "$dstdir $!"; - chdir "$dstdir" or die "$dstdir $!"; + changedir $dstdir; runcmd @git, qw(init -q); runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec(); open H, "> .git/HEAD" or die $!; @@ -1102,7 +1113,7 @@ sub push_parse_changelog ($) { my ($clogpfn) = @_; my $clogp = Dpkg::Control::Hash->new(); - $clogp->load($clogpfn); + $clogp->load($clogpfn) or die; $package = getfield $clogp, 'Source'; my $cversion = getfield $clogp, 'Version'; @@ -1120,13 +1131,13 @@ sub push_parse_dsc ($$$) { my $dversion = getfield $dsc, 'Version'; my $dscpackage = getfield $dsc, 'Source'; ($dscpackage eq $package && $dversion eq $cversion) or - fail "$dsc is for $dscpackage $dversion". + fail "$dscfn is for $dscpackage $dversion". " but debian/changelog is for $package $cversion"; } -sub push_mktag ($$$$$$$$) { +sub push_mktag ($$$$$$$) { my ($head,$clogp,$tag, - $dsc,$dscfn, + $dscfn, $changesfile,$changesfilewhat, $tfn) = @_; @@ -1141,6 +1152,7 @@ sub push_mktag ($$$$$$$$) { } my $cversion = getfield $clogp, 'Version'; + my $clogsuite = getfield $clogp, 'Distribution'; # We make the git tag by hand because (a) that makes it easier # to control the "tagger" (b) we can do remote signing @@ -1152,7 +1164,7 @@ type commit tag $tag tagger $authline -$package release $cversion for $csuite [dgit] +$package release $cversion for $clogsuite [dgit] END close TO or die $!; @@ -1213,11 +1225,11 @@ sub dopush () { commit_quilty_patch(); } check_not_dirty(); - chdir $ud or die $!; + changedir $ud; 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 $!; + changedir '../../../..'; my @diffcmd = (@git, qw(diff --exit-code), $tree); printcmd \*DEBUG,$debugprefix."+",@diffcmd; $!=0; $?=0; @@ -1253,15 +1265,21 @@ sub dopush () { } responder_send_file('changes',$changesfile); + responder_send_command("param head $head"); 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 $tagobjfn; + + if ($we_are_responder) { + $tagobjfn = $tfn->('.signed.tmp'); + responder_receive_files('signed-tag', $tagobjfn); + } else { + $tagobjfn = + push_mktag($head,$clogp,$tag, + "../$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; @@ -1410,23 +1428,39 @@ sub cmd_remote_push_responder { @ARGV = @ARGV[$nrargs..$#ARGV]; die unless @rargs; my ($dir) = @rargs; - chdir $dir or die "$dir: $!"; - $we_are_responder = 1; $debugprefix = ' '; + $we_are_responder = 1; + + open PI, "<&STDIN" or die $!; + open STDIN, "/dev/null" or die $!; + open PO, ">&STDOUT" or die $!; + autoflush PO 1; + open STDOUT, ">&STDERR" or die $!; autoflush STDOUT 1; + responder_send_command("dgit-remote-push-ready"); + + changedir $dir; &cmd_push; } our $i_tmp; +our $i_child_pid; sub i_cleanup { local ($@); - return unless defined $i_tmp; - chdir "/" or die $!; - eval { rmtree $i_tmp; }; + if ($i_child_pid) { + printdebug "(killing remote child $i_child_pid)\n"; + kill 15, $i_child_pid; + } + if (defined $i_tmp && !defined $initiator_tempdir) { + changedir "/"; + eval { rmtree $i_tmp; }; + } } +END { i_cleanup(); } + sub i_method { my ($base,$selector,@args) = @_; $selector =~ s/\-/_/g; @@ -1451,21 +1485,24 @@ sub cmd_rpush { push @rdgit, @ARGV; my @cmd = (@ssh, $host, shellquote @rdgit); printcmd \*DEBUG,$debugprefix."+",@cmd; - eval { + + if (defined $initiator_tempdir) { + rmtree $initiator_tempdir; + mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!"; + $i_tmp = $initiator_tempdir; + } else { $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 $@; + } + $i_child_pid = open2(\*RO, \*RI, @cmd); + changedir $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; + } } sub i_resp_progress ($) { @@ -1475,7 +1512,15 @@ sub i_resp_progress ($) { } sub i_resp_complete { + my $pid = $i_child_pid; + $i_child_pid = undef; # prevents killing some other process with same pid + printdebug "waiting for remote child $pid...\n"; + my $got = waitpid $pid, 0; + die $! unless $got == $pid; + die "remote child failed $?" if $?; + i_cleanup(); + printdebug "all done\n"; exit 0; } @@ -1485,12 +1530,13 @@ sub i_resp_file ($) { my $localpath = "$i_tmp/$localname"; stat $localpath and badproto \*RO, "file $keyword ($localpath) twice"; protocol_receive_file \*RO, $localpath; + i_method "i_file", $keyword; } our %i_param; -sub i_param ($) { - $_[0] =~ m/^(\S+) (.*)$/; +sub i_resp_param ($) { + $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec"; $i_param{$1} = $2; } @@ -1500,44 +1546,60 @@ sub i_resp_want ($) { my ($keyword) = @_; die "$keyword ?" if $i_wanted{$keyword}++; my @localpaths = i_method "i_want", $keyword; - printdebug "]] $keyword @localpaths\n"; + printdebug "[[ $keyword @localpaths\n"; foreach my $localpath (@localpaths) { protocol_send_file \*RI, $localpath; } - print RI "end-files\n" or die $!; + print RI "files-end\n" or die $!; } -our ($i_clogp, $i_version, $i_tag, $i_dscfn); +our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn); -sub i_localname_parsed_changelog { return "remote-changelog.822"; } -sub i_localname_changes { return "remote.changes"; } -sub i_localname_dsc { +sub i_localname_parsed_changelog { + return "remote-changelog.822"; +} +sub i_file_parsed_changelog { ($i_clogp, $i_version, $i_tag, $i_dscfn) = - push_parse_changelog 'remote-changelog.822'; + push_parse_changelog "$i_tmp/remote-changelog.822"; die if $i_dscfn =~ m#/|^\W#; +} + +sub i_localname_dsc { + defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)"; return $i_dscfn; } +sub i_file_dsc { } + +sub i_localname_changes { + defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)"; + $i_changesfn = $i_dscfn; + $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die; + return $i_changesfn; +} +sub i_file_changes { } sub i_want_signed_tag { - defined $i_param{'head'} && defined $i_dscfn - or badproto \*RO, "sequencing error"; + printdebug Dumper(\%i_param, $i_dscfn); + defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp + or badproto \*RO, "premature desire for signed-tag"; my $head = $i_param{'head'}; die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../; - push_parse_dsc $i_dscfn, 'remote dsc', + push_parse_dsc $i_dscfn, 'remote dsc', $i_version; - push_mktag $head, $i_clogp, $i_tag, - $dsc, $i_dscfn, - 'remote.changes', 'remote changes', - 'tag.tag'; + my $tagobjfn = + push_mktag $head, $i_clogp, $i_tag, + $i_dscfn, + $i_changesfn, 'remote changes', + sub { "tag$_[0]"; }; - return 'tag.tag'; + return $tagobjfn; } 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'); + sign_changes $i_changesfn; + return ($i_dscfn, $i_changesfn); } #---------- building etc. ---------- @@ -1627,6 +1689,26 @@ sub build_prep () { build_maybe_quilt_fixup(); } +sub changesopts () { + my @opts =@changesopts[1..$#changesopts]; + if (!defined $changes_since_version) { + my @vsns = archive_query('archive_query'); + if (@vsns) { + @vsns = map { $_->[0] } @vsns; + @vsns = sort { version_compare_string($a, $b) } @vsns; + $changes_since_version = $vsns[0]; + progress "changelog will contain changes since $vsns[0]"; + } else { + $changes_since_version = '_'; + progress "package seems new, not specifying -v"; + } + } + if ($changes_since_version ne '_') { + unshift @opts, "-v$changes_since_version"; + } + return @opts; +} + sub cmd_build { badusage "dgit build implies --clean=dpkg-source" if $cleanmode ne 'dpkg-source'; @@ -1667,9 +1749,9 @@ sub build_source { } my $pwd = cmdoutput qw(env - pwd); my $leafdir = basename $pwd; - chdir ".." or die $!; + changedir ".."; runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir; - chdir $pwd or die $!; + changedir $pwd; runcmd_ordryrun_local qw(sh -ec), 'exec >$1; shift; exec "$@"','x', "../$sourcechanges", @@ -1685,7 +1767,7 @@ sub cmd_build_source { sub cmd_sbuild { build_source(); - chdir ".." or die $!; + changedir ".."; my $pat = "${package}_".(stripepoch $version)."_*.changes"; if (act_local()) { stat $dscfn or fail "$dscfn (in parent directory): $!"; @@ -1696,7 +1778,14 @@ sub cmd_sbuild { } } runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn; - runcmd_ordryrun_local @mergechanges, glob $pat; + my @changesfiles = glob $pat; + @changesfiles = sort { + ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/) + or $a cmp $b + } @changesfiles; + fail "wrong number of different changes files (@changesfiles)" + unless @changesfiles; + runcmd_ordryrun_local @mergechanges, @changesfiles; my $multichanges = "${package}_".(stripepoch $version)."_multi.changes"; if (act_local()) { stat $multichanges or fail "$multichanges: $!"; @@ -1748,6 +1837,9 @@ sub parseopts () { } elsif (m/^--new$/) { push @ropts, $_; $new_package=1; + } elsif (m/^--since-version=([^_]+|_)$/) { + push @ropts, $_; + $changes_since_version = $1; } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1}) && length $om->[0]) { @@ -1761,6 +1853,11 @@ sub parseopts () { } elsif (m/^--existing-package=(.*)/s) { push @ropts, $_; $existing_package = $1; + } elsif (m/^--initiator-tempdir=(.*)/s) { + $initiator_tempdir = $1; + $initiator_tempdir =~ m#^/# or + badusage "--initiator-tempdir must be used specify an". + " absolute, not relative, directory." } elsif (m/^--distro=(.*)/s) { push @ropts, $_; $idistro = $1; @@ -1796,7 +1893,10 @@ sub parseopts () { } elsif (s/^-N/-/) { push @ropts, $&; $new_package=1; - } elsif (m/^-[vm]/) { + } elsif (s/^-v([^_]+|_)$//s) { + push @ropts, $&; + $changes_since_version = $1; + } elsif (m/^-m/) { push @ropts, $&; push @changesopts, $_; $_ = '';