X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=0b177d36fe3f518e4df791dc2dda3d5d0e8ae83f;hp=d287cfe742cde72567cb011e9d2262b84180b52a;hb=345e898e30f28ba054f7c417121498a1d6bcf0de;hpb=e35c1a88e93f56fd874b5cf222e6037b1eb89ca4 diff --git a/dgit b/dgit index d287cfe7..0b177d36 100755 --- a/dgit +++ b/dgit @@ -38,7 +38,7 @@ our $package; our @ropts; our $sign = 1; -our $dryrun = 0; +our $dryrun_level = 0; our $changesfile; our $new_package = 0; our $ignoredirty = 0; @@ -46,6 +46,7 @@ our $noquilt = 0; our $existing_package = 'dpkg'; our $cleanmode = 'dpkg-source'; our $we_are_responder; +our $initiator_tempdir; our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -83,6 +84,8 @@ our $keyid; our $debug = 0; open DEBUG, ">/dev/null" or die $!; +autoflush STDOUT 1; + our $remotename = 'dgit'; our @ourdscfield = qw(Dgit Vcs-Dgit-Master); our $branchprefix = 'dgit'; @@ -113,11 +116,13 @@ sub dscfn ($) { 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; } @@ -131,6 +136,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: @@ -171,7 +182,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"; } @@ -197,17 +207,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"; @@ -216,16 +227,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 $!; } + close PF or die $!; } #---------- remote protocol support, responder ---------- @@ -235,24 +249,26 @@ sub responder_send_command ($) { return unless $we_are_responder; # called even without $we_are_responder printdebug "<< $command\n"; - print $command, "\n" or die $!; + print PO $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; + protocol_send_file \*PO, $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_receive_file \*PI, $fn; } - protocol_expect { m/^files-end$/ } \*STDIN; + protocol_expect { m/^files-end$/ } \*PI; } #---------- remote protocol support, initiator ---------- @@ -268,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"; } @@ -332,8 +348,11 @@ sub runcmd { failedcmd @_ if system @_; } +sub act_local () { return $dryrun_level <= 1; } +sub act_scary () { return !$dryrun_level; } + sub printdone { - if (!$dryrun) { + if (!$dryrun_level) { progress "dgit ok: @_"; } else { progress "would be ok: @_ (but dry run only)"; @@ -366,7 +385,15 @@ sub dryrun_report { } sub runcmd_ordryrun { - if (!$dryrun) { + if (act_scary()) { + runcmd @_; + } else { + dryrun_report @_; + } +} + +sub runcmd_ordryrun_local { + if (act_local()) { runcmd @_; } else { dryrun_report @_; @@ -388,6 +415,7 @@ main usages: important dgit options: -k sign tag and package with instead of default --dry-run -n do not change anything, but go through the motions + --damp-run -L like --dry-run but make local changes, without signing --new -N allow introducing a new package --debug -D increase debug level -c= set git config option (used directly by dgit too) @@ -697,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); @@ -764,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$#; @@ -830,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; @@ -862,7 +890,7 @@ sub ensure_we_have_orig () { $origurl .= "/$f"; die "$f ?" unless $f =~ m/^${package}_/; die "$f ?" if $f =~ m#/#; - runcmd_ordryrun shell_cmd 'cd ..', @dget,'--',$origurl; + runcmd_ordryrun_local shell_cmd 'cd ..', @dget,'--',$origurl; } } @@ -883,7 +911,7 @@ sub is_fast_fwd ($$) { } sub git_fetch_us () { - runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec(); + runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec(); } sub fetch_from_archive () { @@ -990,7 +1018,7 @@ END } if ($lastpush_hash ne $hash) { my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash); - if (!$dryrun) { + if (act_local()) { cmdoutput @upd_cmd; } else { dryrun_report @upd_cmd; @@ -1002,9 +1030,9 @@ END sub clone ($) { my ($dstdir) = @_; canonicalise_suite(); - badusage "dry run makes no sense with clone" if $dryrun; + 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 $!; @@ -1014,7 +1042,7 @@ sub clone ($) { if (check_for_git()) { progress "fetching existing git history"; git_fetch_us(); - runcmd_ordryrun @git, qw(fetch origin); + runcmd_ordryrun_local @git, qw(fetch origin); } else { progress "starting new git history"; } @@ -1033,7 +1061,7 @@ sub fetch () { sub pull () { fetch(); - runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]", + runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]", lrref(); printdone "fetched to ".lrref()." and merged into HEAD"; } @@ -1054,25 +1082,20 @@ sub check_not_dirty () { sub commit_quilty_patch () { my $output = cmdoutput @git, qw(status --porcelain); my %adds; - my $bad=0; foreach my $l (split /\n/, $output) { next unless $l =~ m/\S/; if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) { $adds{$1}++; - } else { - print STDERR "git status: $l\n"; - $bad++; } } - fail "unexpected output from git status (is tree clean?)" if $bad; if (!%adds) { progress "nothing quilty to commit, ok."; return; } - runcmd_ordryrun @git, qw(add), sort keys %adds; + runcmd_ordryrun_local @git, qw(add), sort keys %adds; my $m = "Commit Debian 3.0 (quilt) metadata"; progress "$m"; - runcmd_ordryrun @git, qw(commit -m), $m; + runcmd_ordryrun_local @git, qw(commit -m), $m; } sub madformat ($) { @@ -1090,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'; @@ -1108,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) = @_; @@ -1154,7 +1177,7 @@ END push @sign_cmd, qw(-u),$keyid if defined $keyid; push @sign_cmd, $tfn->('.tmp'); runcmd_ordryrun @sign_cmd; - if (!$dryrun) { + if (act_scary()) { $tagobjfn = $tfn->('.signed.tmp'); runcmd shell_cmd "exec >$tagobjfn", qw(cat --), $tfn->('.tmp'), $tfn->('.tmp.asc'); @@ -1201,11 +1224,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; @@ -1241,19 +1264,20 @@ 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", + "../$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 @git, qw(update-ref), "refs/tags/$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()) { @@ -1263,7 +1287,7 @@ sub dopush () { runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD'; if (!$we_are_responder) { - if (!$dryrun) { + if (act_local()) { rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; } else { progress "[new .dsc left in $dscfn.tmp]"; @@ -1271,7 +1295,7 @@ sub dopush () { } if ($we_are_responder) { - my $dryrunsuffix = $dryrun ? ".tmp" : ""; + my $dryrunsuffix = act_local() ? "" : ".tmp"; responder_receive_files('signed-dsc-changes', "../$dscfn$dryrunsuffix", "$changesfile$dryrunsuffix"); @@ -1398,23 +1422,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 = ' '; - $|=1; + $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; @@ -1439,21 +1479,34 @@ 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_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; + } + + my $pid = $i_child_pid; + $i_child_pid = undef; # prevents killing some other process with same pid + printdebug "waiting for remote child $pid..."; + my $got = waitpid $pid, 0; + die $! unless $got == $pid; + die "remote child failed $?" if $?; + i_cleanup(); - die $@; + exit 0; } sub i_resp_progress ($) { @@ -1477,8 +1530,8 @@ sub i_resp_file ($) { 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; } @@ -1488,6 +1541,7 @@ 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; } @@ -1500,12 +1554,13 @@ 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'; + push_parse_changelog "$i_tmp/remote-changelog.822"; die if $i_dscfn =~ m#/|^\W#; return $i_dscfn; } sub i_want_signed_tag { + printdebug Dumper(\%i_param, $i_dscfn); defined $i_param{'head'} && defined $i_dscfn or badproto \*RO, "sequencing error"; my $head = $i_param{'head'}; @@ -1514,7 +1569,7 @@ sub i_want_signed_tag { push_parse_dsc $i_dscfn, 'remote dsc', push_mktag $head, $i_clogp, $i_tag, - $dsc, $i_dscfn, + $i_dscfn, 'remote.changes', 'remote changes', 'tag.tag'; @@ -1573,7 +1628,7 @@ END local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0; local $ENV{'VISUAL'} = $ENV{'EDITOR'}; local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn; - runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname; + runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname; } if (!open P, '>>', ".pc/applied-patches") { @@ -1618,7 +1673,7 @@ sub cmd_build { badusage "dgit build implies --clean=dpkg-source" if $cleanmode ne 'dpkg-source'; build_prep(); - runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV; + runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV; printdone "build successful\n"; } @@ -1634,7 +1689,7 @@ sub cmd_git_build { push @cmd, "--git-debian-branch=".lbranch(); } push @cmd, changesopts(); - runcmd_ordryrun @cmd, @ARGV; + runcmd_ordryrun_local @cmd, @ARGV; printdone "build successful\n"; } @@ -1643,20 +1698,21 @@ sub build_source { $sourcechanges = "${package}_".(stripepoch $version)."_source.changes"; $dscfn = dscfn($version); if ($cleanmode eq 'dpkg-source') { - runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts(); + runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)), + changesopts(); } else { if ($cleanmode eq 'git') { - runcmd_ordryrun @git, qw(clean -xdf); + runcmd_ordryrun_local @git, qw(clean -xdf); } elsif ($cleanmode eq 'none') { } else { die "$cleanmode ?"; } my $pwd = cmdoutput qw(env - pwd); my $leafdir = basename $pwd; - chdir ".." or die $!; - runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir; - chdir $pwd or die $!; - runcmd_ordryrun qw(sh -ec), + changedir ".."; + runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir; + changedir $pwd; + runcmd_ordryrun_local qw(sh -ec), 'exec >$1; shift; exec "$@"','x', "../$sourcechanges", @dpkggenchanges, qw(-S), changesopts(); @@ -1671,9 +1727,9 @@ sub cmd_build_source { sub cmd_sbuild { build_source(); - chdir ".." or die $!; + changedir ".."; my $pat = "${package}_".(stripepoch $version)."_*.changes"; - if (!$dryrun) { + if (act_local()) { stat $dscfn or fail "$dscfn (in parent directory): $!"; stat $sourcechanges or fail "$sourcechanges (in parent directory): $!"; foreach my $cf (glob $pat) { @@ -1681,10 +1737,10 @@ sub cmd_sbuild { unlink $cf or fail "remove $cf: $!"; } } - runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn; - runcmd_ordryrun @mergechanges, glob $pat; + runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn; + runcmd_ordryrun_local @mergechanges, glob $pat; my $multichanges = "${package}_".(stripepoch $version)."_multi.changes"; - if (!$dryrun) { + if (act_local()) { stat $multichanges or fail "$multichanges: $!"; } printdone "build successful, results in $multichanges\n" or die $!; @@ -1720,7 +1776,10 @@ sub parseopts () { if (m/^--/) { if (m/^--dry-run$/) { push @ropts, $_; - $dryrun=1; + $dryrun_level=2; + } elsif (m/^--damp-run$/) { + push @ropts, $_; + $dryrun_level=1; } elsif (m/^--no-sign$/) { push @ropts, $_; $sign=0; @@ -1744,6 +1803,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; @@ -1764,13 +1828,17 @@ sub parseopts () { } else { while (m/^-./s) { if (s/^-n/-/) { - push @ropts, $_; - $dryrun=1; + push @ropts, $&; + $dryrun_level=2; + } elsif (s/^-L/-/) { + push @ropts, $&; + $dryrun_level=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, $&; @@ -1814,7 +1882,9 @@ if ($ENV{$fakeeditorenv}) { delete $ENV{'DGET_UNPACK'}; parseopts(); -print STDERR "DRY RUN ONLY\n" if $dryrun; +print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1; +print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" + if $dryrun_level == 1; if (!@ARGV) { print STDERR $helpmsg or die $!; exit 8;