X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=60020fc2fe8d09ede9d17bc7d08c8900706b8037;hp=448412e242f218c12a3c32f0ce5efb724d86d7c1;hb=caa11936c6ac7059d0e6f46612cebaf44d5c9115;hpb=b250e873041896930e9e1d2f92df580f5eb91529 diff --git a/dgit b/dgit index 448412e2..60020fc2 100755 --- a/dgit +++ b/dgit @@ -24,6 +24,7 @@ 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; @@ -37,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; @@ -45,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)"); @@ -82,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'; @@ -112,6 +116,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"; } @@ -127,22 +134,28 @@ 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: # < 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 @@ -176,7 +189,13 @@ sub protocol_expect (&$) { 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, "\`$_'"; } @@ -208,11 +227,15 @@ sub protocol_receive_file ($$) { my ($fh, $ourfn) = @_; open PF, ">", $ourfn or die "$ourfn: $!"; for (;;) { - protocol_expect { m/^data-block (.*})$|data-end$/ } \*STDIN; - length $1 or last; - my $d = protocol_read_bytes \*STDIN, $1; + my ($y,$l) = protocol_expect { + m/^data-block (.*})$|data-end$/; + length $1 ? (1,$1) : (0); + } $fh; + last unless $y; + my $d = protocol_read_bytes $fh, $1; print PF $d or die $!; } + printdebug "received into $ourfn\n"; } #---------- remote protocol support, responder ---------- @@ -221,20 +244,22 @@ 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; @@ -314,13 +339,16 @@ sub failedcmd { } sub runcmd { - printcmd(\*DEBUG,"+",@_) if $debug>0; + printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0; $!=0; $?=0; 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)"; @@ -329,16 +357,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; } @@ -349,11 +377,19 @@ sub cmdoutput { } sub dryrun_report { - printcmd(\*STDERR,"#",@_); + printcmd(\*STDERR,$debugprefix."#",@_); } sub runcmd_ordryrun { - if (!$dryrun) { + if (act_scary()) { + runcmd @_; + } else { + dryrun_report @_; + } +} + +sub runcmd_ordryrun_local { + if (act_local()) { runcmd @_; } else { dryrun_report @_; @@ -375,6 +411,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) @@ -630,9 +667,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; @@ -684,7 +721,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); @@ -751,7 +788,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$#; @@ -817,7 +854,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; @@ -849,7 +886,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; } } @@ -870,7 +907,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 () { @@ -904,7 +941,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 -". @@ -938,7 +975,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 < .git/HEAD" or die $!; @@ -1001,7 +1038,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"; } @@ -1020,7 +1057,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"; } @@ -1028,7 +1065,7 @@ sub pull () { sub check_not_dirty () { return if $ignoredirty; my @cmd = (@git, qw(diff --quiet HEAD)); - printcmd(\*DEBUG,"+",@cmd) if $debug>0; + printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>0; $!=0; $?=0; system @cmd; return if !$! && !$?; if (!$! && $?==256) { @@ -1041,25 +1078,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 ($) { @@ -1141,7 +1173,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'); @@ -1163,7 +1195,7 @@ sub sign_changes ($) { } sub dopush () { - print DEBUG "actually entering push\n"; + printdebug "actually entering push\n"; prep_ud(); my $clogpfn = ".git/dgit/changelog.822.tmp"; @@ -1183,18 +1215,18 @@ 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(); } 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 $!; - printcmd \*DEBUG,"+",@_; + changedir '../../../..'; my @diffcmd = (@git, qw(diff --exit-code), $tree); + printcmd \*DEBUG,$debugprefix."+",@diffcmd; $!=0; $?=0; if (system @diffcmd) { if ($! && $?==256) { @@ -1240,7 +1272,7 @@ sub dopush () { 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()) { @@ -1250,7 +1282,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]"; @@ -1258,7 +1290,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"); @@ -1385,9 +1417,10 @@ sub cmd_remote_push_responder { @ARGV = @ARGV[$nrargs..$#ARGV]; die unless @rargs; my ($dir) = @rargs; - chdir $dir or die "$dir: $!"; + changedir $dir; $we_are_responder = 1; - $|=1; + $debugprefix = ' '; + autoflush STDOUT 1; responder_send_command("dgit-remote-push-ready"); &cmd_push; } @@ -1397,7 +1430,8 @@ our $i_tmp; sub i_cleanup { local ($@); return unless defined $i_tmp; - chdir "/" or die $!; + return if defined $initiator_tempdir; + changedir "/"; eval { rmtree $i_tmp; }; } @@ -1421,18 +1455,27 @@ sub cmd_rpush { my @rdgit; 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(); - chdir $i_tmp or die "$i_tmp $!"; + 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); + changedir $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(); @@ -1452,7 +1495,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; @@ -1470,7 +1513,8 @@ our %i_wanted; sub i_resp_want ($) { my ($keyword) = @_; die "$keyword ?" if $i_wanted{$keyword}++; - my @localpaths = i_method "i_want_", $keyword; + my @localpaths = i_method "i_want", $keyword; + printdebug "]] $keyword @localpaths\n"; foreach my $localpath (@localpaths) { protocol_send_file \*RI, $localpath; } @@ -1556,7 +1600,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") { @@ -1601,7 +1645,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"; } @@ -1617,7 +1661,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"; } @@ -1626,20 +1670,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(); @@ -1654,9 +1699,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) { @@ -1664,10 +1709,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 $!; @@ -1703,7 +1748,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; @@ -1727,6 +1775,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; @@ -1747,40 +1800,44 @@ 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, $_; + push @ropts, $&; open DEBUG, ">&STDERR" or die $!; + autoflush DEBUG 1; $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 \`$_'"; @@ -1797,7 +1854,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;