dgit push-*: Provide push-built; make push be an alias

No overall chagne in behaviour since in this commit the default
configuration is "built".

However, the documentation already anticipates the change to add the
warning.

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

1 files changed, 33 insertions, 1 deletions

diff --git a/dgit.1 b/dgit.1
index 39649c0..9894517 100644
--- a/dgit.1
+++ b/dgit.1
@@ -234,7 +234,7 @@ git-buildpackage style branch, not a patches-applied branch.
 
 Tagging, signing and actually uploading should be left to dgit push.
 .TP
-\fBdgit push\fR [\fIsuite\fP]
+\fBdgit push-built\fR [\fIsuite\fP]
 Does an `upload', pushing the current HEAD to the archive (as a source
 package) and to dgit-repos (as git commits).  The package must already
 have been built ready for upload, with the .dsc and .changes
@@ -302,6 +302,34 @@ You will need similar enough versions of dgit on the build-host and
 the invocation host.  The build-host needs gnupg installed, with your
 public key in its keyring (but not your private key, obviously).
 .TP
+\fBdgit push\fR \fI...\fP
+Configurable alias for
+.BR "dgit push-built" ,
+which will change to mean
+.BR "dgit push" ,
+and therefore currently generates a warning.
+
+The behaviour is controlled by the
+.B dgit.default.push-subcmd
+git config option:
+.TS
+l l l .
+\fBsource\fR	runs \fBdgit push-source\fR	future default
+\fBbuilt\fR	and runs \fBdgit push-built\fR
+\fBbuilt,warn\fR	warns, and runs \fBdgit push-built\fR	current default
+\fBreject\fR	fails
+.TE
+
+That setting can safely be passed to older dgit (via
+.BR -c);
+the value
+.B built
+will be supported indefinitely.
+This should be used in scripts that need to work with both
+old versions of dgit (that don't have \fBpush-built\fR)
+and
+new versions (where \fBpush-source\fR is the default).
+.TP
 .B dgit setup-new-tree
 Configure the current working tree the way that dgit clone would have
 set it up.  Like running
@@ -1540,6 +1568,10 @@ or when pushing and
 .TP
 .BI dgit.default.dsc-url-proto-ok
 .TP
+.BI dgit.default.push-subcmd " " source | built | warn,built
+Controls the behaviour of
+.BR "dgit push" .
+.TP
 .BR dgit.vcs-git.suites " \fIsuite\fR[" ; ...]
 .SH ENVIRONMENT VARIABLES
 .TP