X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=2ef32f32a8179f9dc590bfdbcf27419470a62f21;hb=4615f2d1c695caf9b04719f51d57dfae539bb712;hp=8260e9f44862048a8009fe13ee7f7b25c555bb5e;hpb=503bed85ebdc51f2c6fc20ab13a44633e7b93355;p=dgit.git diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 8260e9f4..2ef32f32 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -48,13 +48,13 @@ BEGIN { upstreamversion stripepoch source_file_leafname is_orig_file_of_p_v server_branch server_ref - stat_exists link_ltarget + stat_exists link_ltarget rename_link_xf hashfile fail failmsg ensuredir must_getcwd executable_on_path waitstatusmsg failedcmd_waitstatus failedcmd_report_cmd failedcmd runcmd shell_cmd cmdoutput cmdoutput_errok - git_rev_parse git_cat_file + git_rev_parse changedir_git_toplevel git_cat_file git_get_ref git_get_symref git_for_each_ref git_for_each_tag_referring is_fast_fwd git_check_unmodified @@ -98,7 +98,7 @@ our $distro_re = $component_re; our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+}; our $branchprefix = 'dgit'; our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s; -our $extra_orig_namepart_re = qr{[-0-9a-z]+}; +our $extra_orig_namepart_re = qr{[-0-9a-zA-Z]+}; our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?}; our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)'; our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?"; @@ -148,18 +148,18 @@ sub setup_sigwarn () { sub initdebug ($) { ($debugprefix) = @_; - open DEBUG, ">/dev/null" or die $!; + open DEBUG, ">/dev/null" or confess $!; } sub enabledebug () { - open DEBUG, ">&STDERR" or die $!; + open DEBUG, ">&STDERR" or confess $!; DEBUG->autoflush(1); $debuglevel ||= 1; } sub enabledebuglevel ($) { my ($newlevel) = @_; # may be undef (eg from env var) - die if $debuglevel; + confess if $debuglevel; $newlevel //= 0; $newlevel += 0; return unless $newlevel; @@ -181,7 +181,7 @@ sub printdebug { print DEBUG $debugprefix unless $printdebug_noprefix; pop @_ while @_ and !length $_[-1]; return unless @_; - print DEBUG @_ or die $!; + print DEBUG @_ or confess $!; $printdebug_noprefix = $_[-1] !~ m{\n$}; } @@ -214,9 +214,9 @@ sub shellquote { sub printcmd { my $fh = shift @_; my $intro = shift @_; - print $fh $intro," " or die $!; - print $fh shellquote @_ or die $!; - print $fh "\n" or die $!; + print $fh $intro," " or confess $!; + print $fh shellquote @_ or confess $!; + print $fh "\n" or confess $!; } sub debugcmd { @@ -284,7 +284,7 @@ sub stat_exists ($) { my ($f) = @_; return 1 if stat $f; return 0 if $!==&ENOENT; - die "stat $f: $!"; + confess "stat $f: $!"; } sub _us () { @@ -307,7 +307,7 @@ sub ensuredir ($) { my ($dir) = @_; # does not create parents return if mkdir $dir; return if $! == EEXIST; - die "mkdir $dir: $!"; + confess "mkdir $dir: $!"; } sub must_getcwd () { @@ -347,7 +347,7 @@ sub waitstatusmsg () { sub failedcmd_report_cmd { my $intro = shift @_; $intro //= __ "failed command"; - { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or die $!; }; + { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess $!; }; } sub failedcmd_waitstatus { @@ -391,11 +391,11 @@ sub cmdoutput_errok { confess Dumper(\@_)." ?" if grep { !defined } @_; local $printdebug_when_debuglevel = $debugcmd_when_debuglevel; debugcmd "|",@_; - open P, "-|", @_ or die "$_[0] $!"; + open P, "-|", @_ or confess "$_[0] $!"; my $d; $!=0; $?=0; { local $/ = undef; $d =

; } - die $! if P->error; + confess $! if P->error; if (!close P) { printdebug "=>!$?\n"; return undef; } chomp $d; if ($debuglevel > 0) { @@ -422,7 +422,71 @@ sub link_ltarget ($$) { } my $r = link $old, $new; $r = symlink $old, $new if !$r && $!==EXDEV; - $r or die "(sym)link $old $new: $!"; + $r or fail "(sym)link $old $new: $!\n"; +} + +sub rename_link_xf ($$$) { + # renames/moves or links/copies $src to $dst, + # even if $dst is on a different fs + # (May use the filename "$dst.tmp".); + # On success, returns true. + # On failure, returns false and sets + # $@ to a reason message + # $! to an errno value, or -1 if not known + # having possibly printed something about mv to stderr. + # Not safe to use without $keeporig if $dst might be a symlink + # to $src, as it might delete $src leaving $dst invalid. + my ($keeporig,$src,$dst) = @_; + if ($keeporig + ? link $src, $dst + : rename $src, $dst) { + return 1; + } + if ($! != EXDEV) { + $@ = "$!"; + return 0; + } + if (!stat $src) { + $@ = f_ "stat source file: %S", $!; + return 0; + } + my @src_stat = (stat _)[0..1]; + + my @dst_stat; + if (stat $dst) { + @dst_stat = (stat _)[0..1]; + } elsif ($! == ENOENT) { + } else { + $@ = f_ "stat destination file: %S", $!; + return 0; + } + + if ("@src_stat" eq "@dst_stat") { + # (Symlinks to) the same file. No need for a copy but + # we may need to delete the original. + printdebug "rename_link_xf $keeporig $src $dst EXDEV but same\n"; + } else { + $!=0; $?=0; + my @cmd = (qw(cp --), $src, "$dst.tmp"); + debugcmd '+',@cmd; + if (system @cmd) { + failedcmd_report_cmd undef, @cmd; + $@ = failedcmd_waitstatus(); + $! = -1; + return 0; + } + if (!rename "$dst.tmp", $dst) { + $@ = f_ "finally install file after cp: %S", $!; + return 0; + } + } + if (!$keeporig) { + if (!unlink $src) { + $@ = f_ "delete old file after cp: %S", $!; + return 0; + } + } + return 1; } sub hashfile ($) { @@ -436,6 +500,15 @@ sub git_rev_parse ($) { return cmdoutput qw(git rev-parse), "$_[0]~0"; } +sub changedir_git_toplevel () { + my $toplevel = cmdoutput qw(git rev-parse --show-toplevel); + length $toplevel or fail __ < ($type, $data) or ('missing', undef) @@ -455,18 +528,18 @@ sub git_cat_file ($;$) { if (!$gcf_pid) { my @cmd = qw(git cat-file --batch); debugcmd "GCF|", @cmd; - $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or die $!; + $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess $!; } - printdebug "GCF>| ", $objname, "\n"; - print $gcf_i $objname, "\n" or die $!; + printdebug "GCF>| $objname\n"; + print $gcf_i $objname, "\n" or confess $!; my $x = <$gcf_o>; printdebug "GCF<| ", $x; if ($x =~ m/ (missing)$/) { return $chk->($1, undef); } - my ($type, $size) = $x =~ m/^.* (\w+) (\d+)\n/ or die "$objname ?"; + my ($type, $size) = $x =~ m/^.* (\w+) (\d+)\n/ or confess "$objname ?"; my $data; - (read $gcf_o, $data, $size) == $size or die "$objname $!"; + (read $gcf_o, $data, $size) == $size or confess "$objname $!"; $x = <$gcf_o>; - $x eq "\n" or die "$objname ($_) $!"; + $x eq "\n" or confess "$objname ($_) $!"; return $chk->($type, $data); } @@ -494,22 +567,22 @@ sub git_for_each_ref ($$;$) { if (defined $gitdir) { @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd); } - open GFER, "-|", @cmd or die $!; + open GFER, "-|", @cmd or confess $!; debugcmd "|", @cmd; while () { - chomp or die "$_ ?"; + chomp or confess "$_ ?"; printdebug "|> ", $_, "\n"; - m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or die "$_ ?"; + m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or confess "$_ ?"; $func->($1,$2,$3,$4); } - $!=0; $?=0; close GFER or die "$pattern $? $!"; + $!=0; $?=0; close GFER or confess "$pattern $? $!"; } sub git_get_ref ($) { # => '' if no such ref my ($refname) = @_; local $_ = $refname; - s{^refs/}{[r]efs/} or die "$refname $_ ?"; + s{^refs/}{[r]efs/} or confess "$refname $_ ?"; return cmdoutput qw(git for-each-ref --format=%(objectname)), $_; } @@ -541,8 +614,8 @@ sub git_check_unmodified () { if ($?==256) { fail $cached - ? "git index contains changes (does not match HEAD)" - : "working tree is dirty (does not match HEAD)"; + ? __ "git index contains changes (does not match HEAD)" + : __ "working tree is dirty (does not match HEAD)"; } else { failedcmd @cmd; } @@ -592,11 +665,11 @@ sub git_slurp_config_src ($) { local $/="\0"; my $r = { }; - open GITS, "-|", @cmd or die $!; + open GITS, "-|", @cmd or confess $!; while () { - chomp or die; + chomp or confess; printdebug "=> ", (messagequote $_), "\n"; - m/\n/ or die "$_ ?"; + m/\n/ or confess "$_ ?"; push @{ $r->{$`} }, $'; #'; } $!=0; $?=0; @@ -613,8 +686,8 @@ sub gdr_ffq_prev_branchinfo ($) { # branch message is undef # weird-symref } no $symref, # notbranch } no $ffq_prev - return ('detached', 'detached HEAD') unless defined $symref; - return ('weird-symref', 'HEAD symref is not to refs/') + return ('detached', __ 'detached HEAD') unless defined $symref; + return ('weird-symref', __ 'HEAD symref is not to refs/') unless $symref =~ m{^refs/}; my $ffq_prev = "refs/$ffq_refprefix/$'"; my $gdrlast = "refs/$gdrlast_refprefix/$'"; @@ -630,17 +703,19 @@ sub parsecontrolfh ($$;$) { my %opts = ('name' => $desc); $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned; $c = Dpkg::Control::Hash->new(%opts); - $c->parse($fh,$desc) or die "parsing of $desc failed"; + $c->parse($fh,$desc) or fail f_ "parsing of %s failed", $desc; last if $allowsigned; last if $dpkgcontrolhash_noissigned; my $issigned= $c->get_option('is_pgp_signed'); if (!defined $issigned) { $dpkgcontrolhash_noissigned= 1; - seek $fh, 0,0 or die "seek $desc: $!"; + seek $fh, 0,0 or confess "seek $desc: $!"; } elsif ($issigned) { - fail "control file $desc is (already) PGP-signed. ". + fail f_ + "control file %s is (already) PGP-signed. ". " Note that dgit push needs to modify the .dsc and then". - " do the signature itself"; + " do the signature itself", + $desc; } else { last; } @@ -651,9 +726,9 @@ sub parsecontrolfh ($$;$) { sub parsecontrol { my ($file, $desc, $allowsigned) = @_; my $fh = new IO::Handle; - open $fh, '<', $file or die "$file: $!"; + open $fh, '<', $file or fail f_ "open %s (%s): %s", $file, $desc, $!; my $c = parsecontrolfh($fh,$desc,$allowsigned); - $fh->error and die $!; + $fh->error and confess $!; close $fh; return $c; } @@ -662,7 +737,7 @@ sub parsechangelog { my $c = Dpkg::Control::Hash->new(name => 'parsed changelog'); my $p = new IO::Handle; my @cmd = (qw(dpkg-parsechangelog), @_); - open $p, '-|', @cmd or die $!; + open $p, '-|', @cmd or confess $!; $c->parse($p); $?=0; $!=0; close $p or failedcmd @cmd; return $c; @@ -680,19 +755,19 @@ sub parsechangelog_loop ($$$) { # @$clogcmd is qw(dpkg-parsechangelog ...some...options...) # calls $fn->($thisstanza, $desc); debugcmd "|",@$clogcmd; - open CLOGS, "-|", @$clogcmd or die $!; + open CLOGS, "-|", @$clogcmd or confess $!; for (;;) { my $stanzatext = do { local $/=""; ; }; printdebug "clogp stanza ".Dumper($stanzatext) if $debuglevel>1; last if !defined $stanzatext; my $desc = "$descbase, entry no.$."; - open my $stanzafh, "<", \$stanzatext or die; + open my $stanzafh, "<", \$stanzatext or confess; my $thisstanza = parsecontrolfh $stanzafh, $desc, 1; $fn->($thisstanza, $desc); } - die $! if CLOGS->error; + confess $! if CLOGS->error; close CLOGS or $?==SIGPIPE or failedcmd @$clogcmd; } @@ -702,18 +777,18 @@ sub make_commit_text ($) { my @cmd = (qw(git hash-object -w -t commit --stdin)); debugcmd "|",@cmd; print Dumper($text) if $debuglevel > 1; - my $child = open2($out, $in, @cmd) or die $!; + my $child = open2($out, $in, @cmd) or confess $!; my $h; eval { - print $in $text or die $!; - close $in or die $!; + print $in $text or confess $!; + close $in or confess $!; $h = <$out>; - $h =~ m/^\w+$/ or die; + $h =~ m/^\w+$/ or confess; $h = $&; printdebug "=> $h\n"; }; close $out; - waitpid $child, 0 == $child or die "$child $!"; + waitpid $child, 0 == $child or confess "$child $!"; $? and failedcmd @cmd; return $h; } @@ -728,7 +803,7 @@ sub reflog_cache_insert ($$$) { my $parent = $ref; $parent =~ s{/[^/]+$}{}; ensuredir "$maindir_gitcommon/logs/$parent"; my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>' - or die $!; + or confess $!; my $oldcache = git_get_ref $ref; @@ -737,12 +812,13 @@ sub reflog_cache_insert ($$$) { # git update-ref doesn't always update, in this case. *sigh* my $authline = (ucfirst _us()). ' <'._us().'@example.com> 1000000000 +0000'; - my $dummy = make_commit_text <(no reflog)\n"; finish 0; } - exec @cmd; die $!; + exec @cmd; die f_ "exec %s: %s\n", $cmd[0], $!; } while () { chomp; @@ -773,7 +849,7 @@ sub reflog_cache_lookup ($$) { close GC; return $1; } - die $! if GC->error; + confess $! if GC->error; failedcmd unless close GC; return undef; } @@ -832,7 +908,7 @@ sub record_maindir () { if (!defined $maindir) { $maindir = must_getcwd(); if (!stat "$maindir/.git") { - fail "cannot stat $maindir/.git: $!"; + fail f_ "cannot stat %s/.git: %s", $maindir, $!; } if (-d _) { # we fall back to this in case we have a pre-worktree @@ -854,15 +930,16 @@ sub ensure_a_playground_parent ($) { record_maindir(); $spc = "$maindir_gitdir/$spc"; my $parent = dirname $spc; - mkdir $parent or $!==EEXIST - or fail "failed to mkdir playground parent $parent: $!"; + mkdir $parent or $!==EEXIST or fail f_ + "failed to mkdir playground parent %s: %s", $parent, $!; return $spc; } sub ensure_a_playground ($) { my ($spc) = @_; $spc = ensure_a_playground_parent $spc; - mkdir $spc or $!==EEXIST or fail "failed to mkdir a playground $spc: $!"; + mkdir $spc or $!==EEXIST or fail f_ + "failed to mkdir a playground %s: %s", $spc, $!; return $spc; } @@ -870,7 +947,8 @@ sub fresh_playground ($) { my ($spc) = @_; $spc = ensure_a_playground_parent $spc; rmtree $spc; - mkdir $spc or fail "failed to mkdir the playground $spc: $!"; + mkdir $spc or fail f_ + "failed to mkdir the playground %s: %s", $spc, $!; return $spc; } @@ -897,11 +975,11 @@ sub playtree_setup (;$) { # $maindir_gitdir contains our main working "dgit", HEAD, etc. # $maindir_gitcommon the shared stuff, including .objects rmtree('.git/objects'); - symlink "$maindir_gitcommon/objects",'.git/objects' or die $!; + symlink "$maindir_gitcommon/objects",'.git/objects' or confess $!; ensuredir '.git/info'; - open GA, "> .git/info/attributes" or die $!; - print GA "* $negate_harmful_gitattrs\n" or die $!; - close GA or die $!; + open GA, "> .git/info/attributes" or confess $!; + print GA "* $negate_harmful_gitattrs\n" or confess $!; + close GA or confess $!; } 1;