Author: hwright
Date: Mon Oct 10 18:42:02 2011
New Revision: 1181128
URL: http://svn.apache.org/viewvc?rev=1181128&view=rev
Log:
Merge r1177001 from trunk:
* r1177001
Update bash_completion to match 1.7 commands and options.
Justification:
Frustrating to be offered the wrong options.
Votes:
+1: philip
+0: danielsh
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/tools/client-side/bash_completion
subversion/branches/1.7.x/tools/client-side/bash_completion_test
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 18:42:02 2011
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,115
8187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174797,1177001
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1181128&r1=1181127&r2=1181128&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 10 18:42:02 2011
@@ -141,14 +141,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1177001
- Update bash_completion to match 1.7 commands and options.
- Justification:
- Frustrating to be offered the wrong options.
- Votes:
- +1: philip
- +0: danielsh
-
* r1175888
Fix some object lifetime issues in the JavaHL bindings.
Justification:
Modified: subversion/branches/1.7.x/tools/client-side/bash_completion
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/tools/client-side/bash_completion?rev=1181128&r1=1181127&r2=1181128&view=diff
==============================================================================
--- subversion/branches/1.7.x/tools/client-side/bash_completion (original)
+++ subversion/branches/1.7.x/tools/client-side/bash_completion Mon Oct 10
18:42:02 2011
@@ -167,7 +167,7 @@ _svn()
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"
+ cmds="$cmds switch unlock update upgrade"
# help options have a strange command status...
local helpOpts='--help -h'
@@ -182,7 +182,7 @@ _svn()
optsParam="$optsParam|--old|--new|--config-dir|--config-option"
optsParam="$optsParam|--native-eol|-l|--limit|-c|--change"
optsParam="$optsParam|--depth|--set-depth|--with-revprop"
- optsParam="$optsParam|--changelist|--accept|--show-revs"
+ optsParam="$optsParam|--cl|--changelist|--accept|--show-revs"
# svn:* and other (env SVN_BASH_*_PROPS) properties
local svnProps revProps allProps psCmds propCmds
@@ -788,12 +788,14 @@ _svn()
fi
# otherwise build possible options for the command
- pOpts="--username --password --no-auth-cache --non-interactive"
+ pOpts="--username --password --no-auth-cache --non-interactive \
+ --trust-server-cert"
mOpts="-m --message -F --file --encoding --force-log --with-revprop"
rOpts="-r --revision"
qOpts="-q --quiet"
nOpts="-N --non-recursive --depth"
gOpts="-g --use-merge-history"
+ cOpts="--cl --changelist"
cmdOpts=
case $cmd in
@@ -812,22 +814,23 @@ _svn()
cmdOpts="$rOpts $pOpts"
;;
changelist|cl)
- cmdOpts="--targets $pOpts $qOpts --changelist \
+ cmdOpts="--targets $pOpts $qOpts $cOpts \
-R --recursive --depth --remove"
;;
checkout|co)
cmdOpts="$rOpts $qOpts $nOpts $pOpts --ignore-externals \
- --force --accept"
+ --force"
;;
cleanup)
cmdOpts="--diff3-cmd $pOpts"
;;
commit|ci)
cmdOpts="$mOpts $qOpts $nOpts --targets --editor-cmd $pOpts \
- --no-unlock --changelist --keep-changelists"
+ --no-unlock $cOpts --keep-changelists"
;;
copy|cp)
- cmdOpts="$mOpts $rOpts $qOpts --editor-cmd $pOpts --parents"
+ cmdOpts="$mOpts $rOpts $qOpts --editor-cmd $pOpts --parents \
+ --ignore-externals"
;;
delete|del|remove|rm)
cmdOpts="--force $mOpts $qOpts --targets --editor-cmd $pOpts \
@@ -836,11 +839,12 @@ _svn()
diff|di)
cmdOpts="$rOpts -x --extensions --diff-cmd --no-diff-deleted \
$nOpts $pOpts --force --old --new --notice-ancestry \
- -c --change --summarize --changelist --xml --svnpatch"
+ -c --change --summarize $cOpts --xml --git \
+ --internal-diff --show-copies-as-adds"
;;
export)
cmdOpts="$rOpts $qOpts $pOpts $nOpts --force --native-eol \
- --ignore-externals"
+ --ignore-externals --ignore-keywords"
;;
help|h|\?)
cmdOpts=
@@ -851,7 +855,7 @@ _svn()
;;
info)
cmdOpts="$pOpts $rOpts --targets -R --recursive --depth \
- --incremental --xml --changelist"
+ --incremental --xml $cOpts"
;;
list|ls)
cmdOpts="$rOpts -v --verbose -R --recursive $pOpts \
@@ -864,15 +868,18 @@ _svn()
log)
cmdOpts="$rOpts -v --verbose --targets $pOpts --stop-on-copy \
--incremental --xml $qOpts -l --limit -c --change \
- $gOpts --with-all-revprops --with-revprop"
+ $gOpts --with-all-revprops --with-revprop --depth \
+ --diff --diff-cmd -x --extensions --internal-diff \
+ --with-no-revprops"
;;
merge)
cmdOpts="$rOpts $nOpts $qOpts --force --dry-run --diff3-cmd \
$pOpts --ignore-ancestry -c --change -x --extensions \
- --record-only --accept --reintegrate"
+ --record-only --accept --reintegrate \
+ --allow-mixed-revisions"
;;
mergeinfo)
- cmdOpts="$rOpts $pOpts --show-revs"
+ cmdOpts="$rOpts $pOpts --depth --show-revs -R --recursive"
;;
mkdir)
cmdOpts="$mOpts $qOpts --editor-cmd $pOpts --parents"
@@ -882,10 +889,10 @@ _svn()
--parents"
;;
patch)
- cmdOpts="$qOpts --force"
+ cmdOpts="$qOpts $pOpts --dry-run --ignore-whitespace
--reverse-diff --strip"
;;
propdel|pdel|pd)
- cmdOpts="$qOpts -R --recursive $rOpts $pOpts --changelist \
+ cmdOpts="$qOpts -R --recursive $rOpts $pOpts $cOpts \
--depth"
[[ $isRevProp || ! $prop ]] && cmdOpts="$cmdOpts --revprop"
;;
@@ -895,23 +902,23 @@ _svn()
cmdOpts="$cmdOpts --revprop $rOpts"
;;
propget|pget|pg)
- cmdOpts="-v --verbose -R --recursive $rOpts --strict $pOpts
--changelist \
+ cmdOpts="-v --verbose -R --recursive $rOpts --strict $pOpts
$cOpts \
--depth --xml"
[[ $isRevProp || ! $prop ]] && cmdOpts="$cmdOpts --revprop"
;;
proplist|plist|pl)
cmdOpts="-v --verbose -R --recursive $rOpts --revprop $qOpts \
- $pOpts --changelist --depth --xml"
+ $pOpts $cOpts --depth --xml"
;;
propset|pset|ps)
cmdOpts="$qOpts --targets -R --recursive \
- --encoding $pOpts --force --changelist --depth"
+ --encoding $pOpts --force $cOpts --depth"
[[ $isRevProp || ! $prop ]] && \
cmdOpts="$cmdOpts --revprop $rOpts"
[[ $val ]] || cmdOpts="$cmdOpts -F --file"
;;
relocate)
- cmdOpts="--ignore-externals"
+ cmdOpts="--ignore-externals $pOpts"
;;
resolve)
cmdOpts="--targets -R --recursive $qOpts $pOpts --accept \
@@ -921,25 +928,29 @@ _svn()
cmdOpts="--targets -R --recursive $qOpts $pOpts --depth"
;;
revert)
- cmdOpts="--targets -R --recursive $qOpts --changelist \
+ cmdOpts="--targets -R --recursive $qOpts $cOpts \
--depth $pOpts"
;;
status|stat|st)
cmdOpts="-u --show-updates -v --verbose $nOpts $qOpts $pOpts \
--no-ignore --ignore-externals --incremental --xml \
- --changelist"
+ $cOpts"
;;
switch|sw)
cmdOpts="--relocate $rOpts $nOpts $qOpts $pOpts --diff3-cmd \
- --force --accept --ignore-externals --set-depth"
+ --force --accept --ignore-externals --set-depth \
+ --ignore-ancestry"
;;
unlock)
cmdOpts="--targets --force $pOpts"
;;
update|up)
cmdOpts="$rOpts $nOpts $qOpts $pOpts --diff3-cmd \
- --ignore-externals --force --accept --changelist \
- --editor-cmd --set-depth"
+ --ignore-externals --force --accept $cOpts \
+ --parents --editor-cmd --set-depth"
+ ;;
+ upgrade)
+ cmdOpts="$qOpts $pOpts"
;;
*)
;;
Modified: subversion/branches/1.7.x/tools/client-side/bash_completion_test
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/tools/client-side/bash_completion_test?rev=1181128&r1=1181127&r2=1181128&view=diff
==============================================================================
--- subversion/branches/1.7.x/tools/client-side/bash_completion_test (original)
+++ subversion/branches/1.7.x/tools/client-side/bash_completion_test Mon Oct 10
18:42:02 2011
@@ -116,7 +116,7 @@ get_svn_options() {
{ svn help "$1" |
# Find the relevant lines; remove "arg" and description.
sed -n -e '1,/^Valid options:$/d;/^ -/!d' \
- -e 's/\( arg\)* * : .*//;p' |
+ -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
