Dgit.pm: Add debugging to git_for_each_...

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index f166f11b58464b7d9616579fb3af89f4ef01a41d..49cc073391392dbeabf44fb3848200928ccb79ba 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,8 +16,11 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
-                      $package_re $component_re $branchprefix
-                      initdebug enabledebug printdebug debugcmd
+                      git_for_each_tag_referring
+                      $package_re $component_re $deliberately_re
+                      $branchprefix
+                      initdebug enabledebug enabledebuglevel
+                      printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
@@ -28,14 +31,20 @@ our @EXPORT_OK;
 
 our $package_re = '[0-9a-z][-+.0-9a-z]*';
 our $component_re = '[0-9a-zA-Z][-+.0-9a-zA-Z]*';
+our $deliberately_re = "(?:TEST-)?$package_re";
 our $branchprefix = 'dgit';
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
-# 1 is reserved in case something fails with `exit 1'
+# 1 is reserved in case something fails with `exit 1' and to spot
+# dynamic loader, runtime, etc., failures, which report 127 or 255
 sub NOFFCHECK () { return 0x2; }
 sub FRESHREPO () { return 0x4; }
-# 0x80 is reserved
+
+sub printdebug;
+sub shellquote;
+sub printcmd;
+sub debugcmd;
 
 sub debiantag ($) { 
     my ($v) = @_;
@@ -58,17 +67,23 @@ sub git_for_each_ref ($$) {
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
     # $reftail is RHS of ref after refs/\w+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'
-    my $fh = new IO::File "-|", qw(git for-each-ref), $pattern or die $!;
-    while (<$fh>) {
-       m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
+    my @cmd = (qw(git for-each-ref), $pattern);
+    open GFER, "-|", @cmd or die $!;
+    debugcmd "|", @cmd;
+    while (<GFER>) {
+       chomp or die "$_ ?";
+       printdebug "|> ", $_, "\n";
+       m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))$# or die "$_ ?";
        $func->($1,$2,$3,$4);
     }
-    $!=0; $?=0; close $fh or die "$pattern $? $!";
+    $!=0; $?=0; close GFER or die "$pattern $? $!";
 }
 
 sub git_for_each_tag_referring ($$) {
     my ($objreferring, $func) = @_;
     # calls $func->($objid,$fullrefname,$tagname);
+    printdebug "git_for_each_tag_referring ",
+        ($objreferring // 'UNDEF'),"\n";
     git_for_each_ref('refs/tags', sub {
        my ($objid,$objtype,$fullrefname,$tagname) = @_;
        next unless $objtype eq 'tag';
@@ -91,6 +106,16 @@ sub enabledebug () {
     $debuglevel ||= 1;
 }
     
+sub enabledebuglevel ($) {
+    my ($newlevel) = @_; # may be undef (eg from env var)
+    die if $debuglevel;
+    $newlevel //= 0;
+    $newlevel += 0;
+    return unless $newlevel;
+    $debuglevel = $newlevel;
+    enabledebug();
+}
+    
 sub printdebug {
     print DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
 }
@@ -100,7 +125,7 @@ sub shellquote {
     local $_;
     foreach my $a (@_) {
        $_ = $a;
-       if (m{[^-=_./0-9a-z]}i) {
+       if (!length || m{[^-=_./0-9a-z]}i) {
            s{['\\]}{'\\$&'}g;
            push @out, "'$_'";
        } else {