You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2018/01/18 15:12:01 UTC
svn commit: r1821508 - in /subversion/branches/shelve-checkpoint:
subversion/svn/cl.h subversion/svn/shelve-cmd.c subversion/svn/svn.c
tools/client-side/bash_completion
Author: julianfoad
Date: Thu Jan 18 15:12:01 2018
New Revision: 1821508
URL: http://svn.apache.org/viewvc?rev=1821508&view=rev
Log:
On the 'shelve-checkpoint' branch: Remove 'shelf xxx' 2-word command forms.
It was too messy in our current command handling infrastructure. Use
'shelf-xxx' command forms for most of the commands, plus 'shelve' and
'shelves' and 'unshelve'.
Modified:
subversion/branches/shelve-checkpoint/subversion/svn/cl.h
subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
subversion/branches/shelve-checkpoint/subversion/svn/svn.c
subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
Modified: subversion/branches/shelve-checkpoint/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/cl.h?rev=1821508&r1=1821507&r2=1821508&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/cl.h (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/cl.h Thu Jan 18 15:12:01 2018
@@ -305,7 +305,6 @@ svn_opt_subcommand_t
svn_cl__revert,
svn_cl__resolve,
svn_cl__resolved,
- svn_cl__shelf,
svn_cl__shelf_diff,
svn_cl__shelf_drop,
svn_cl__shelf_list,
Modified: subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c?rev=1821508&r1=1821507&r2=1821508&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c Thu Jan 18 15:12:01 2018
@@ -932,43 +932,3 @@ svn_cl__shelf_log(apr_getopt_t *os,
return SVN_NO_ERROR;
}
-
-/* This implements the `svn_opt_subcommand_t' interface. */
-svn_error_t *
-svn_cl__shelf(apr_getopt_t *os,
- void *baton,
- apr_pool_t *pool)
-{
- const char *subsubcommand;
-
- SVN_ERR(get_next_argument(&subsubcommand, os, pool, pool));
-
- if (strcmp(subsubcommand, "diff") == 0)
- {
- SVN_ERR(svn_cl__shelf_diff(os, baton, pool));
- }
- else if (strcmp(subsubcommand, "drop") == 0)
- {
- SVN_ERR(svn_cl__shelf_drop(os, baton, pool));
- }
- else if (strcmp(subsubcommand, "list") == 0)
- {
- SVN_ERR(svn_cl__shelf_list(os, baton, pool));
- }
- else if (strcmp(subsubcommand, "log") == 0)
- {
- SVN_ERR(svn_cl__shelf_log(os, baton, pool));
- }
- else if (strcmp(subsubcommand, "save") == 0)
- {
- SVN_ERR(svn_cl__shelf_save(os, baton, pool));
- }
- else
- {
- return svn_error_createf(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- _("Unknown shelf command '%s'"),
- subsubcommand);
- }
-
- return SVN_NO_ERROR;
-}
Modified: subversion/branches/shelve-checkpoint/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/svn.c?rev=1821508&r1=1821507&r2=1821508&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/svn.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/svn.c Thu Jan 18 15:12:01 2018
@@ -1683,28 +1683,6 @@ const svn_opt_subcommand_desc2_t svn_cl_
" the output of 'svn help merge' for 'undo'.\n"),
{opt_targets, 'R', opt_depth, 'q', opt_changelist} },
- { "shelf", svn_cl__shelf, {0}, N_
- ("Examine or manage a shelf.\n"
- "usage: 1. shelf diff -> see shelf-diff\n"
- " 2. shelf drop -> see shelf-drop\n"
- " 3. shelf list -> see shelf-list (shelves)\n"
- " 4. shelf log -> see shelf-log\n"
- " 5. shelf save -> see shelf-save\n"
- "\n"
- " See also:\n"
- " shelve\n"
- " unshelve\n"
- "\n"
- " The shelving feature is EXPERIMENTAL. This command is likely to change\n"
- " in the next release, and there is no promise of backward compatibility.\n"
- ),
- {opt_dry_run, 'q',
- opt_depth, opt_targets, opt_changelist,
- /* almost SVN_CL__LOG_MSG_OPTIONS but not currently opt_with_revprop: */
- 'm', 'F', opt_force_log, opt_editor_cmd, opt_encoding,
- }
- },
-
{ "shelf-diff", svn_cl__shelf_diff, {0}, N_
("Show shelved changes as a diff.\n"
"usage: shelf-diff NAME [VERSION]\n"
@@ -3078,7 +3056,7 @@ sub_main(int *exit_code, int argc, const
|| subcommand->cmd_func == svn_cl__move
|| subcommand->cmd_func == svn_cl__lock
|| subcommand->cmd_func == svn_cl__propedit
- || subcommand->cmd_func == svn_cl__shelf
+ || subcommand->cmd_func == svn_cl__shelf_save
|| subcommand->cmd_func == svn_cl__shelve))
{
/* If the -F argument is a file that's under revision control,
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=1821508&r1=1821507&r2=1821508&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/tools/client-side/bash_completion (original)
+++ subversion/branches/shelve-checkpoint/tools/client-side/bash_completion Thu Jan 18 15:12:01 2018
@@ -248,7 +248,7 @@ _svn()
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 shelf shelf-diff shelf-drop shelf-list shelf-log"
+ cmds="$cmds shelf-diff shelf-drop shelf-list shelf-log"
cmds="$cmds shelf-save shelve shelves unshelve"
# help options have a strange command status...
@@ -1023,13 +1023,6 @@ _svn()
upgrade)
cmdOpts="$qOpts $pOpts"
;;
- shelf)
- cmdOpts="diff drop list log save \
- --dry-run \
- --depth --targets $cOpts \
- -m --message -F --file --encoding --force-log --editor-cmd \
- $qOpts $pOpts"
- ;;
shelf-diff)
cmdOpts="$pOpts"
;;