Break out $branchprefix, server_branch, server_ref into Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index b93477402c72dc3a3662c7a99cab81d6735b66b2..211bae3a6626d503b6452864aa5815769ba1c6e9 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -11,8 +11,8 @@ BEGIN {
 
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(debiantag
-                      $package_re);
+    @EXPORT      = qw(debiantag server_branch server_ref
+                      $package_re $branchprefix);
     %EXPORT_TAGS = ( policyflags => qw() );
     @EXPORT_OK   = qw();
 }
@@ -20,6 +20,7 @@ BEGIN {
 our @EXPORT_OK;
 
 our $package_re = '[0-9a-z][-+.0-9a-z]*';
+our $branchprefix = 'dgit';
 
 
 # policy hook exit status bits
@@ -39,4 +40,7 @@ sub debiantag ($) {
     return "debian/$v";
 }
 
+sub server_branch ($) { return "$branchprefix/$_[0]"; }
+sub server_ref ($) { return "refs/".server_branch($_[0]); }
+
 1;

diff --git a/dgit b/dgit
index 0b5bf05c1de0f81c07a87af0c5cda369e58ec331..a0144bcde7901c8c702d5a77878f8f841aa29391 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -104,15 +104,14 @@ autoflush STDOUT 1;
 
 our $remotename = 'dgit';
 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
-our $branchprefix = 'dgit';
 our $csuite;
 our $instead_distro;
 
 sub lbranch () { return "$branchprefix/$csuite"; }
 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
 sub lref () { return "refs/heads/".lbranch(); }
-sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
-sub rrref () { return "refs/$branchprefix/$csuite"; }
+sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
+sub rrref () { return server_ref($csuite); }
 
 sub stripepoch ($) {
     my ($vsn) = @_;