X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=827dc62d0c866464b32123a44d92f6a9b78bba16;hp=c344d31ea2dba92e699fb9006ae39f0781c6f842;hb=d088ef80cb2c01ba3a98179173f11d32706349a9;hpb=c5fa3c2b04ef704afb6273a8d25f060e4fff96ad

diff --git a/dgit b/dgit
index c344d31e..827dc62d 100755
--- a/dgit
+++ b/dgit
@@ -985,12 +985,6 @@ sub commit_getclogp ($) {
     $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
 }
 
-sub must_getcwd () {
-    my $d = getcwd();
-    defined $d or fail "getcwd failed: $!";
-    return $d;
-}
-
 sub parse_dscdata () {
     my $dscfh = new IO::File \$dscdata, '<' or die $!;
     printdebug Dumper($dscdata) if $debuglevel>1;
@@ -1685,7 +1679,7 @@ sub prep_ud (;$) {
 }
 
 sub mktree_in_ud_here () {
-    workarea_setup $gitcfgs{local};
+    playtree_setup $gitcfgs{local};
 }
 
 sub git_write_tree () {
@@ -4492,21 +4486,18 @@ END
     pull();
 }
 
-sub cmd_push {
+sub prep_push () {
     parseopts();
-    badusage "-p is not allowed with dgit push" if defined $package;
+    build_or_push_prep_early();
+    pushing();
     check_not_dirty();
-    my $clogp = parsechangelog();
-    $package = getfield $clogp, 'Source';
     my $specsuite;
     if (@ARGV==0) {
     } elsif (@ARGV==1) {
 	($specsuite) = (@ARGV);
     } else {
-	badusage "incorrect arguments to dgit push";
+	badusage "incorrect arguments to dgit $subcommand";
     }
-    $isuite = getfield $clogp, 'Distribution';
-    pushing();
     if ($new_package) {
 	local ($package) = $existing_package; # this is a hack
 	canonicalise_suite();
@@ -4516,9 +4507,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();
 }
 
@@ -5818,14 +5813,18 @@ sub cmd_clean () {
     maybe_unapply_patches_again();
 }
 
-sub build_prep_early () {
-    our $build_prep_early_done //= 0;
-    return if $build_prep_early_done++;
-    badusage "-p is not allowed when building" if defined $package;
+sub build_or_push_prep_early () {
+    our $build_or_push_prep_early_done //= 0;
+    return if $build_or_push_prep_early_done++;
+    badusage "-p is not allowed with dgit $subcommand" if defined $package;
     my $clogp = parsechangelog();
     $isuite = getfield $clogp, 'Distribution';
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+}
+
+sub build_prep_early () {
+    build_or_push_prep_early();
     notpushing();
     check_not_dirty();
 }