svn commit: r1662291 - in /subversion/trunk/tools/client-side: bash_completion bash_completion_test

[philip]

Author: philip
Date: Wed Feb 25 18:17:16 2015
New Revision: 1662291

URL: http://svn.apache.org/r1662291
Log:
* tools/client-side/bash_completion
  (_svn): Stop offering deprecated options.

* tools/client-side/bash_completion_test: Don't expect deprecated
   options or --help for help.

Modified:
    subversion/trunk/tools/client-side/bash_completion
    subversion/trunk/tools/client-side/bash_completion_test

Modified: subversion/trunk/tools/client-side/bash_completion
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/bash_completion?rev=1662291&r1=1662290&r2=1662291&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/bash_completion (original)
+++ subversion/trunk/tools/client-side/bash_completion Wed Feb 25 18:17:16 2015
@@ -781,7 +781,7 @@ _svn()
 
        # otherwise build possible options for the command
        pOpts="--username --password --no-auth-cache --non-interactive \
-              --trust-server-cert --trust-unknown-ca --trust-cn-mismatch \
+              --trust-unknown-ca --trust-cn-mismatch \
               --trust-expired --trust-not-yet-valid --trust-other-failure \
               --force-interactive"
        mOpts="-m --message -F --file --encoding --force-log --with-revprop"
@@ -876,7 +876,7 @@ _svn()
        merge)
                cmdOpts="$rOpts $nOpts $qOpts --force --dry-run --diff3-cmd \
                         $pOpts --ignore-ancestry -c --change -x --extensions \
-                         --record-only --accept --reintegrate \
+                         --record-only --accept \
                         --allow-mixed-revisions -v --verbose"
                ;;
        mergeinfo)
@@ -905,7 +905,7 @@ _svn()
                    cmdOpts="$cmdOpts --revprop $rOpts"
                ;;
        propget|pget|pg)
-               cmdOpts="-v --verbose -R --recursive $rOpts --strict \
+               cmdOpts="-v --verbose -R --recursive $rOpts --no-newline \
                         $pOpts $cOpts --depth --xml --show-inherited-props"
                [[ $isRevProp || ! $prop ]] && cmdOpts="$cmdOpts --revprop"
                ;;

Modified: subversion/trunk/tools/client-side/bash_completion_test
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/bash_completion_test?rev=1662291&r1=1662290&r2=1662291&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/bash_completion_test (original)
+++ subversion/trunk/tools/client-side/bash_completion_test Wed Feb 25 18:17:16 
2015
@@ -114,14 +114,18 @@ get_svn_subcommands() {
 # Usage: get_svn_options SUBCMD
 get_svn_options() {
   { svn help "$1" |
+      # Remove deprecated options
+      grep -v deprecated |
       # Find the relevant lines; remove "arg" and description.
       sed -n -e '1,/^Valid options:$/d;/^  -/!d' \
              -e 's/\( ARG\)* * : .*//;p' |
       # Remove brackets; put each word on its own line.
       tr -d '] ' | tr '[' '\n'
     # The following options are always accepted but not listed in the help
-    echo "-h"
-    echo "--help"
+    if [ "$1" != "help" ] ; then
+      echo "-h"
+      echo "--help"
+    fi
   } | sort
   
 }