From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 3 Feb 2017 04:15:15 +0000 (-0700)
Subject: cmd_push: Factor out all prep code
X-Git-Tag: archive/debian/4.1~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=dfe552723d6904f4a16a95d5a13fdec43cbb10c8

cmd_push: Factor out all prep code

Will be re-used by cmd_push_source.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index c344d31e..c17b42a9 100755
--- a/dgit
+++ b/dgit
@@ -4492,9 +4492,9 @@ END
     pull();
 }
 
-sub cmd_push {
+sub prep_push () {
     parseopts();
-    badusage "-p is not allowed with dgit push" if defined $package;
+    badusage "-p is not allowed with dgit $subcommand" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();
     $package = getfield $clogp, 'Source';
@@ -4503,7 +4503,7 @@ sub cmd_push {
     } elsif (@ARGV==1) {
 	($specsuite) = (@ARGV);
     } else {
-	badusage "incorrect arguments to dgit push";
+	badusage "incorrect arguments to dgit $subcommand";
     }
     $isuite = getfield $clogp, 'Distribution';
     pushing();
@@ -4516,9 +4516,13 @@ sub cmd_push {
     if (defined $specsuite &&
 	$specsuite ne $isuite &&
 	$specsuite ne $csuite) {
-	    fail "dgit push: changelog specifies $isuite ($csuite)".
+	    fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
 	        " but command line specifies $specsuite";
     }
+}
+
+sub cmd_push {
+    prep_push();
     dopush();
 }