Author: julianfoad
Date: Thu Dec 7 14:57:01 2017
New Revision: 1817376
URL: http://svn.apache.org/viewvc?rev=1817376&view=rev
Log:
On the 'shelve-checkpoint' branch: Don't accept '--with-revprop' as
we don't currently handle it. Update 'bash_completion'.
* subversion/svn/svn.c
(svn_cl__cmd_table): Remove '--with-revprop' from 'svn savepoint'.
* tools/client-side/bash_completion
(_svn): Add missing savepoint options. Reformat for consistency.
Modified:
subversion/branches/shelve-checkpoint/subversion/svn/svn.c
subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
Modified: subversion/branches/shelve-checkpoint/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/svn.c?rev=1817376&r1=1817375&r2=1817376&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/svn.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/svn.c Thu Dec 7
14:57:01 2017
@@ -1679,7 +1679,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
),
{'q', opt_dry_run,
opt_depth, opt_targets, opt_changelist,
- SVN_CL__LOG_MSG_OPTIONS,
+ /* almost SVN_CL__LOG_MSG_OPTIONS but not currently opt_with_revprop: */
+ 'm', 'F', opt_force_log, opt_editor_cmd, opt_encoding,
opt_list},
{ {opt_list, N_("list all versions of a shelf")} }
},
Modified:
subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/tools/client-side/bash_completion?rev=1817376&r1=1817375&r2=1817376&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
(original)
+++ subversion/branches/shelve-checkpoint/tools/client-side/bash_completion Thu
Dec 7 14:57:01 2017
@@ -1022,14 +1022,21 @@ _svn()
upgrade)
cmdOpts="$qOpts $pOpts"
;;
- checkpoint)
- cmdOpts="$qOpts save restore list --list"
+ checkpoint|savepoint|sp)
+ cmdOpts="save restore list --list --dry-run \
+ --depth --targets $cOpts \
+ -m --message -F --file --encoding --force-log
--editor-cmd \
+ $qOpts $pOpts"
;;
shelve)
- cmdOpts="$qOpts --keep-local --delete --list -m --message -F
--file --encoding --force-log --editor-cmd --dry-run --depth --targets $cOpts
$pOpts"
+ cmdOpts="--keep-local --delete --list --dry-run \
+ --depth --targets $cOpts \
+ -m --message -F --file --encoding --force-log
--editor-cmd \
+ $qOpts $pOpts"
;;
unshelve)
- cmdOpts="$qOpts --list $pOpts --dry-run"
+ cmdOpts="--list --dry-run \
+ $qOpts $pOpts"
;;
shelves)
cmdOpts="$qOpts $pOpts"
