Author: philip
Date: Wed Feb 20 11:47:28 2013
New Revision: 1448102
URL: http://svn.apache.org/r1448102
Log:
* tools/client-side/bash_completion
(_svn): Add missing options to commit, diff, list, log, merge,
move, propget, proplist. Don't make --accept madatory for resolve.
(_svnadmin): Add freeze.
Modified:
subversion/trunk/tools/client-side/bash_completion
Modified: subversion/trunk/tools/client-side/bash_completion
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/bash_completion?rev=1448102&r1=1448101&r2=1448102&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/bash_completion (original)
+++ subversion/trunk/tools/client-side/bash_completion Wed Feb 20 11:47:28 2013
@@ -647,14 +647,6 @@ _svn()
[[ ${COMPREPLY} ]] && return 0
fi
- # force mandatory --accept option for 'resolve' command
- if [[ $cmd = 'resolve' && ! $acceptOpt ]]
- then
- COMPREPLY=( $( compgen -W '--accept' -- $cur ) )
- # force option now! others will be available on later completions
- return 0
- fi
-
# maximum number of additional arguments expected in various forms
case $cmd in
merge)
@@ -789,7 +781,7 @@ _svn()
# otherwise build possible options for the command
pOpts="--username --password --no-auth-cache --non-interactive \
- --trust-server-cert"
+ --trust-server-cert --force-interactive"
mOpts="-m --message -F --file --encoding --force-log --with-revprop"
rOpts="-r --revision"
qOpts="-q --quiet"
@@ -826,7 +818,8 @@ _svn()
;;
commit|ci)
cmdOpts="$mOpts $qOpts $nOpts --targets --editor-cmd $pOpts \
- --no-unlock $cOpts --keep-changelists"
+ --no-unlock $cOpts --keep-changelists \
+ --include-externals"
;;
copy|cp)
cmdOpts="$mOpts $rOpts $qOpts --editor-cmd $pOpts --parents \
@@ -840,7 +833,9 @@ _svn()
cmdOpts="$rOpts -x --extensions --diff-cmd --no-diff-deleted \
$nOpts $pOpts --force --old --new --notice-ancestry \
-c --change --summarize $cOpts --xml --git \
- --internal-diff --show-copies-as-adds"
+ --internal-diff --show-copies-as-adds \
+ --ignore-properties --properties-only --no-diff-added \
+ --patch-compatible"
;;
export)
cmdOpts="$rOpts $qOpts $pOpts $nOpts --force --native-eol \
@@ -859,7 +854,7 @@ _svn()
;;
list|ls)
cmdOpts="$rOpts -v --verbose -R --recursive $pOpts \
- --incremental --xml --depth"
+ --incremental --xml --depth --include-externals"
;;
lock)
cmdOpts="-m --message -F --file --encoding --force-log \
@@ -870,13 +865,13 @@ _svn()
--incremental --xml $qOpts -l --limit -c --change \
$gOpts --with-all-revprops --with-revprop --depth \
--diff --diff-cmd -x --extensions --internal-diff \
- --with-no-revprops"
+ --with-no-revprops --search --search-and"
;;
merge)
cmdOpts="$rOpts $nOpts $qOpts --force --dry-run --diff3-cmd \
$pOpts --ignore-ancestry -c --change -x --extensions \
--record-only --accept --reintegrate \
- --allow-mixed-revisions"
+ --allow-mixed-revisions -v --verbose"
;;
mergeinfo)
cmdOpts="$rOpts $pOpts --depth --show-revs -R --recursive"
@@ -886,7 +881,7 @@ _svn()
;;
move|mv|rename|ren)
cmdOpts="$mOpts $rOpts $qOpts --force --editor-cmd $pOpts \
- --parents"
+ --parents --allow-mixed-revisions"
;;
patch)
cmdOpts="$qOpts $pOpts --dry-run --ignore-whitespace \
@@ -903,13 +898,13 @@ _svn()
cmdOpts="$cmdOpts --revprop $rOpts"
;;
propget|pget|pg)
- cmdOpts="-v --verbose -R --recursive $rOpts --strict $pOpts
$cOpts \
- --depth --xml"
+ cmdOpts="-v --verbose -R --recursive $rOpts --strict \
+ $pOpts $cOpts --depth --xml --show-inherited-props"
[[ $isRevProp || ! $prop ]] && cmdOpts="$cmdOpts --revprop"
;;
proplist|plist|pl)
cmdOpts="-v --verbose -R --recursive $rOpts --revprop $qOpts \
- $pOpts $cOpts --depth --xml"
+ $pOpts $cOpts --depth --xml --show-inherited-props"
;;
propset|pset|ps)
cmdOpts="$qOpts --targets -R --recursive \
@@ -1035,7 +1030,7 @@ _svnadmin ()
cur=${COMP_WORDS[COMP_CWORD]}
# Possible expansions, without pure-prefix abbreviations such as "h".
- cmds='crashtest create deltify dump help hotcopy list-dblogs \
+ cmds='crashtest create deltify dump freeze help hotcopy list-dblogs \
list-unused-dblogs load lslocks lstxns pack recover rmlocks \
rmtxns setlog setrevprop setuuid upgrade verify --version'
@@ -1069,6 +1064,9 @@ _svnadmin ()
dump)
cmdOpts="-r --revision --incremental -q --quiet --deltas"
;;
+ freeze)
+ cmdOpts="-F --file"
+ ;;
help|h|\?)
cmdOpts="$cmds"
;;
