Dgit.pm: printcmd: Print in one go

[dgit.git] / git-debpush

diff --git a/git-debpush b/git-debpush
index 67f6555b17b5135465d65227c2eef8da2a9c8e73..63057ed24ee3334c3cfc4dd0d5d35bcc3cdec1ef 100755 (executable)
--- a/git-debpush
+++ b/git-debpush
@@ -20,7 +20,7 @@
 set -e$DGIT_TEST_DEBPUSH_DEBUG
 set -o pipefail
 
-# PRINCIPLES OF OPERATION
+# DESIGN PRINCIPLES
 #
 # - do not invoke dgit, do anything involving any tarballs, no network
 #   access except `git push` right at the end
@@ -66,7 +66,7 @@ get_file_from_ref () {
 # ---- Parse command line
 
 getopt=$(getopt -s bash -o 'nfu:' \
-              -l 'no-push,force,branch:,remote:,distro:,quilt:,gbp,dpm,\
+              -l 'no-push,force,branch:,remote:,distro:,upstream:,quilt:,gbp,dpm,\
 baredebian,baredebian+git,baredebian+tarball' \
               -n "$us" -- "$@")
 eval "set - $getopt"
@@ -90,11 +90,13 @@ while true; do
         '--remote')       remote=$2;               shift 2; continue ;;
         '--distro')       distro=$2;               shift 2; continue ;;
         '--quilt')        quilt_mode=$2;           shift 2; continue ;;
+        '--upstream')     upstream_tag=$2;         shift 2; continue ;;
 
         '--baredebian'|'--baredebian+git')
             quilt_mode=baredebian;         shift; continue ;;
         '--baredebian+tarball')
-            quilt_mode=baredebian+tarball; shift; continue ;;
+            fail "--baredebian+tarball quilt mode not supported"
+            ;;
 
         '--') shift; break ;;
        *) badusage "unknown option $1" ;;
@@ -106,8 +108,9 @@ if [ $# != 0 ]; then
 fi
 
 case "$quilt_mode" in
-    linear|auto|smash|nofix|gbp|dpm|unapplied|baredebian|baredebian+tarball|'') ;;
+    linear|auto|smash|nofix|gbp|dpm|unapplied|baredebian|'') ;;
     baredebian+git) quilt_mode="baredebian" ;;
+    baredebian+tarball) fail "--baredebian+tarball quilt mode not supported" ;;
     *) badusage "invalid quilt mode: $quilt_mode" ;;
 esac
 
@@ -214,9 +217,26 @@ esac
 
 upstream_info=""
 if $upstream; then
-    upstream_tag=$(git deborig --just-print --version="$version" \
-                       | head -n1)
-    upstream_committish=$(git rev-parse ${upstream_tag}^{})
+    if [ "x$upstream_tag" = x ]; then
+       upstream_tag=$(
+           set +e
+           git deborig --just-print --version="$version" \
+                          | head -n1
+           ps="${PIPESTATUS[*]}"
+           set -e
+           case "$ps" in
+               "0 0"|"141 0") ;; # ok or SIGPIPE
+               *" 0")
+                   echo >&2 \
+ "$us: git-deborig failed; maybe try $us --upstream=TAG"
+                   exit 0
+                   ;;
+               *) exit 127; # presumably head will have complained
+           esac
+       )
+       if [ "x$upstream_tag" = x ]; then exit 127; fi
+    fi
+    upstream_committish=$(git rev-parse "refs/tags/${upstream_tag}"^{})
     upstream_info=" upstream-tag=$upstream_tag upstream=$upstream_committish"
 fi
 
@@ -265,5 +285,6 @@ EOF
 # ---- Do a git push
 
 if $pushing; then
-    git push "$remote" "${push_branch[@]}" "$upstream_tag" "$debian_tag"
+    # xxx when user can specify upstream_tag, must cope with spaces
+    git push "$remote" "${push_branch[@]}" $upstream_tag "$debian_tag"
 fi