diff options
Diffstat (limited to 'tools/client-side/bash_completion')
| -rw-r--r-- | tools/client-side/bash_completion | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/tools/client-side/bash_completion b/tools/client-side/bash_completion index eabc15c..8187fde 100644 --- a/tools/client-side/bash_completion +++ b/tools/client-side/bash_completion @@ -162,12 +162,12 @@ _svn() cur=${COMP_WORDS[COMP_CWORD]} # Possible expansions, without pure-prefix abbreviations such as "up". - cmds='add blame annotate praise cat changelist cl checkout co cleanup' + cmds='add auth blame annotate praise cat changelist cl checkout co cleanup' cmds="$cmds commit ci copy cp delete remove rm diff export help import" cmds="$cmds info list ls lock log merge mergeinfo mkdir move mv rename" cmds="$cmds patch propdel pdel propedit pedit propget pget proplist" cmds="$cmds plist propset pset relocate resolve resolved revert status" - cmds="$cmds switch unlock update upgrade" + cmds="$cmds switch unlock update upgrade" # help options have a strange command status... local helpOpts='--help -h' @@ -781,7 +781,8 @@ _svn() # otherwise build possible options for the command pOpts="--username --password --no-auth-cache --non-interactive \ - --trust-server-cert --force-interactive" + --trust-server-cert-failures \ + --force-interactive" mOpts="-m --message -F --file --encoding --force-log --with-revprop" rOpts="-r --revision" qOpts="-q --quiet" @@ -798,12 +799,15 @@ _svn() cmdOpts="--auto-props --no-auto-props --force --targets \ --no-ignore --parents $nOpts $qOpts $pOpts" ;; + auth) + cmdOpts="--remove --show-passwords $pOpts" + ;; blame|annotate|ann|praise) cmdOpts="$rOpts $pOpts -v --verbose --incremental --xml \ -x --extensions --force $gOpts" ;; cat) - cmdOpts="$rOpts $pOpts" + cmdOpts="$rOpts $pOpts --ignore-keywords" ;; changelist|cl) cmdOpts="--targets $pOpts $qOpts $cOpts \ @@ -814,7 +818,8 @@ _svn() --force" ;; cleanup) - cmdOpts="--diff3-cmd $pOpts" + cmdOpts="--diff3-cmd $pOpts --include-externals -q --quiet\ + --remove-ignored --remove-unversioned" ;; commit|ci) cmdOpts="$mOpts $qOpts $nOpts --targets --editor-cmd $pOpts \ @@ -823,7 +828,7 @@ _svn() ;; copy|cp) cmdOpts="$mOpts $rOpts $qOpts --editor-cmd $pOpts --parents \ - --ignore-externals" + --ignore-externals --pin-externals" ;; delete|del|remove|rm) cmdOpts="--force $mOpts $qOpts --targets --editor-cmd $pOpts \ @@ -850,7 +855,8 @@ _svn() ;; info) cmdOpts="$pOpts $rOpts --targets -R --recursive --depth \ - --incremental --xml $cOpts" + --include-externals --incremental --xml \ + --show-item --no-newline $cOpts" ;; list|ls) cmdOpts="$rOpts -v --verbose -R --recursive $pOpts \ @@ -870,11 +876,12 @@ _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) - cmdOpts="$rOpts $pOpts --depth --show-revs -R --recursive" + cmdOpts="$rOpts $pOpts --depth --show-revs -R --recursive \ + $qOpts -v --verbose --incremental --log" ;; mkdir) cmdOpts="$mOpts $qOpts --editor-cmd $pOpts --parents" @@ -898,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" ;; @@ -930,7 +937,7 @@ _svn() status|stat|st) cmdOpts="-u --show-updates -v --verbose $nOpts $qOpts $pOpts \ --no-ignore --ignore-externals --incremental --xml \ - $cOpts" + $rOpts $cOpts" ;; switch|sw) cmdOpts="--relocate $rOpts $nOpts $qOpts $pOpts --diff3-cmd \ @@ -1030,7 +1037,8 @@ _svnadmin () cur=${COMP_WORDS[COMP_CWORD]} # Possible expansions, without pure-prefix abbreviations such as "h". - cmds='crashtest create deltify dump freeze help hotcopy list-dblogs \ + cmds='crashtest create delrevprop deltify dump freeze help hotcopy \ + info list-dblogs \ list-unused-dblogs load lock lslocks lstxns pack recover rmlocks \ rmtxns setlog setrevprop setuuid unlock upgrade verify --version' @@ -1093,8 +1101,9 @@ _svnadmin () setlog) cmdOpts="-r --revision --bypass-hooks" ;; - setrevprop) - cmdOpts="-r --revision --use-pre-revprop-change-hook \ + setrevprop|delrevprop) + cmdOpts="-r --revision -t --transaction \ + --use-pre-revprop-change-hook \ --use-post-revprop-change-hook" ;; verify) @@ -1126,6 +1135,8 @@ _svnadmin () --help) cmdOpts=${cmdOpts/ -h / } ;; -r) cmdOpts=${cmdOpts/ --revision / } ;; --revision) cmdOpts=${cmdOpts/ -r / } ;; + -t) cmdOpts=${cmdOpts/ --transaction / } ;; + --transaction) cmdOpts=${cmdOpts/ -t / } ;; -F) cmdOpts=${cmdOpts/ --file / } ;; --file) cmdOpts=${cmdOpts/ -F / } ;; -M) cmdOpts=${cmdOpts/ --memory-cache-size / } ;; @@ -1226,8 +1237,8 @@ _svnlook () cur=${COMP_WORDS[COMP_CWORD]} # Possible expansions, without pure-prefix abbreviations such as "h". - cmds='author cat changed date diff dirs-changed help history info \ - lock log propget proplist tree uuid youngest --version' + cmds='author cat changed date diff dirs-changed filesize help history \ + info lock log propget proplist tree uuid youngest --version' if [[ $COMP_CWORD -eq 1 ]] ; then COMPREPLY=( $( compgen -W "$cmds" -- $cur ) ) @@ -1268,6 +1279,9 @@ _svnlook () dirs-changed) cmdOpts="-r --revision -t --transaction" ;; + filesize) + cmdOpts="-r --revision -t --transaction" + ;; help|h|\?) cmdOpts="$cmds" ;; @@ -1380,7 +1394,8 @@ _svnsync () copy-revprops|initialize|init|synchronize|sync) cmdOpts="--non-interactive --no-auth-cache --trust-server-cert \ --source-username --source-password --sync-username \ - --sync-password --config-dir --config-option -q --quiet" + --sync-password --config-dir --config-option \ + -q --quiet -M --memory-cache-size" ;; help|h|\?) cmdOpts="$cmds" |