summaryrefslogtreecommitdiff
path: root/Debian/Dgit.pm
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-17 14:42:40 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:15 +0100
commit8007c2b1326e7deffa1c71d2d51ebca08107084a (patch)
tree08c35a00a2af9d3955c0355fe646499d61376816 /Debian/Dgit.pm
parent7346d26dc6821b6ad23d12d2281459e82631ce1a (diff)
Dgit.pm: Move debugging earlier in file (pure code motion)
Diffstat (limited to 'Debian/Dgit.pm')
-rw-r--r--Debian/Dgit.pm97
1 files changed, 46 insertions, 51 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index ce7ae8d..b21a431 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -41,57 +41,6 @@ our $branchprefix = 'dgit';
sub NOFFCHECK () { return 0x2; }
sub FRESHREPO () { return 0x4; }
-sub printdebug;
-sub shellquote;
-sub printcmd;
-sub debugcmd;
-
-sub debiantag ($) {
- my ($v) = @_;
- $v =~ y/~:/_%/;
- return "debian/$v";
-}
-
-sub server_branch ($) { return "$branchprefix/$_[0]"; }
-sub server_ref ($) { return "refs/".server_branch($_[0]); }
-
-sub stat_exists ($) {
- my ($f) = @_;
- return 1 if stat $f;
- return 0 if $!==&ENOENT;
- die "stat $f: $!";
-}
-
-sub git_for_each_ref ($$) {
- my ($pattern,$func) = @_;
- # 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 @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 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) = @_;
- return unless $objtype eq 'tag';
- return if defined $objreferring and $objid ne $objreferring;
- $func->($objid,$fullrefname,$tagname);
- });
-}
-
our $debugprefix;
our $debuglevel = 0;
@@ -148,4 +97,50 @@ sub debugcmd {
printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
}
+sub debiantag ($) {
+ my ($v) = @_;
+ $v =~ y/~:/_%/;
+ return "debian/$v";
+}
+
+sub server_branch ($) { return "$branchprefix/$_[0]"; }
+sub server_ref ($) { return "refs/".server_branch($_[0]); }
+
+sub stat_exists ($) {
+ my ($f) = @_;
+ return 1 if stat $f;
+ return 0 if $!==&ENOENT;
+ die "stat $f: $!";
+}
+
+sub git_for_each_ref ($$) {
+ my ($pattern,$func) = @_;
+ # 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 @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 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) = @_;
+ return unless $objtype eq 'tag';
+ return if defined $objreferring and $objid ne $objreferring;
+ $func->($objid,$fullrefname,$tagname);
+ });
+}
+
1;