dgit: Make rpush be a configurable alias like push

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

3 files changed, 11 insertions, 3 deletions

diff --git a/dgit b/dgit
index dbfcaae..c8c0fc4 100755
--- a/dgit
+++ b/dgit
@@ -5117,6 +5117,14 @@ sub cmd_push {
         f_ 'dgit push, but dgit.default.push-subcmd set to %s', $spec
     });
 }
+sub cmd_rpush { 
+    some_push_alias('rpush', \&cmd_rpush_source, \&cmd_rpush_built,
+		    [qw(dgit.default.rpush-subcmd
+			dgit.default.push-subcmd)], sub {
+        my ($spec) = @_;
+        f_ 'dgit rpush, but dgit.default.[r]push-subcmd set to %s', $spec
+    });
+}
 sub some_push_alias ($$@) {
     my ($verb, $if_source, $if_built, $cfgs, $badvalue_msg) = @_;
     my $spec = cfg @$cfgs;
@@ -5221,7 +5229,7 @@ sub pre_rpush ()        { not_necessarily_a_tree(); }
 
 sub cmd_rpush_source { rpush_core('push-source'); }
 sub cmd_rpush_built  { rpush_core('push');        }
-sub cmd_rpush        { cmd_rpush_built;           }
+
 sub rpush_core ($) {
     ($rpush_verb) = @_;
 
diff --git a/tests/tests/rpush b/tests/tests/rpush
index 3ccf605..9bff006 100755
--- a/tests/tests/rpush
+++ b/tests/tests/rpush
@@ -21,7 +21,7 @@ t-dgit --dpkg-buildpackage:-d build
 
 mkdir $tmp/empty
 cd $tmp/empty
-t-dgit --ssh=$troot/ssh rpush somehost:$tmp/$p
+t-dgit --ssh=$troot/ssh rpush-built somehost:$tmp/$p
 
 cd $tmp/$p
 t-pushed-good dgit/sid
diff --git a/tests/tests/rpush-quilt b/tests/tests/rpush-quilt
index bb49fc6..aca403a 100755
--- a/tests/tests/rpush-quilt
+++ b/tests/tests/rpush-quilt
@@ -11,7 +11,7 @@ t-dgit -wgf --quilt=gbp --dgit-view-save=split.b build-source
 mkdir $tmp/empty
 cd $tmp/empty
 t-dgit --quilt=gbp --dgit-view-save=split.p \
-	--ssh=$troot/ssh rpush somehost:$tmp/$p
+	--ssh=$troot/ssh rpush-built somehost:$tmp/$p
 
 cd $tmp/$p
 t-gbp-pushed-good