X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=3f2988e4b3599f08b4b9e54fa5b2170c53d96723;hp=c39ff72e6e2c9e388f3c0a473244f42b02500e38;hb=7684f83e49bdc4d883e682abd922a7722cf996c4;hpb=96ac307f0b9d186d589d221dabfb0e403169aa08

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index c39ff72e..3f2988e4 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -6,6 +6,7 @@ use strict;
 use warnings;
 
 use POSIX;
+use IO::Handle;
 
 BEGIN {
     use Exporter   ();
@@ -15,7 +16,13 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
-                      $package_re $component_re $branchprefix);
+                      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)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
 }
@@ -24,14 +31,15 @@ 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'
-sub NOFFCHECK () { return 2; }
-sub FRESHREPO () { return 4; }
-# 128 is reserved
+sub NOFFCHECK () { return 0x2; }
+sub FRESHREPO () { return 0x4; }
+# 0x80 is reserved
 
 sub debiantag ($) { 
     my ($v) = @_;
@@ -54,12 +62,12 @@ 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>) {
+    open GFER, "-|", qw(git for-each-ref), $pattern or die $!;
+    while (<GFER>) {
 	m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\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 ($$) {
@@ -73,4 +81,60 @@ sub git_for_each_tag_referring ($$) {
     });
 }
 
+our $debugprefix;
+our $debuglevel = 0;
+
+sub initdebug ($) { 
+    ($debugprefix) = @_;
+    open DEBUG, ">/dev/null" or die $!;
+}
+
+sub enabledebug () {
+    open DEBUG, ">&STDERR" or die $!;
+    DEBUG->autoflush(1);
+    $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;
+}
+
+sub shellquote {
+    my @out;
+    local $_;
+    foreach my $a (@_) {
+	$_ = $a;
+	if (!length || m{[^-=_./0-9a-z]}i) {
+	    s{['\\]}{'\\$&'}g;
+	    push @out, "'$_'";
+	} else {
+	    push @out, $_;
+	}
+    }
+    return join ' ', @out;
+}
+
+sub printcmd {
+    my $fh = shift @_;
+    my $intro = shift @_;
+    print $fh $intro," " or die $!;
+    print $fh shellquote @_ or die $!;
+    print $fh "\n" or die $!;
+}
+
+sub debugcmd {
+    my $extraprefix = shift @_;
+    printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
+}
+
 1;