From 8007c2b1326e7deffa1c71d2d51ebca08107084a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 May 2015 14:42:40 +0100
Subject: [PATCH] Dgit.pm: Move debugging earlier in file (pure code motion)

---
 Debian/Dgit.pm | 97 ++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index ce7ae8dc..b21a431e 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;
-- 
2.30.2