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/12 16:39:06 UTC
svn commit: r1821005 - in /subversion/branches/shelve-checkpoint:
subversion/svn/shelve-cmd.c subversion/svn/svn.c
tools/client-side/bash_completion
Author: julianfoad
Date: Fri Jan 12 16:39:06 2018
New Revision: 1821005
URL: http://svn.apache.org/viewvc?rev=1821005&view=rev
Log:
On the 'shelve-checkpoint' branch: lose --diff,--drop,--list,--log CLI options.
Modified:
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/shelve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c?rev=1821005&r1=1821004&r2=1821005&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c Fri Jan 12 16:39:06 2018
@@ -860,30 +860,8 @@ svn_cl__shelf(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
- svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
const char *subsubcommand;
- if (opt_state->show_diff)
- {
- SVN_ERR(svn_cl__shelf_diff(os, baton, pool));
- return SVN_NO_ERROR;
- }
- else if (opt_state->remove)
- {
- SVN_ERR(svn_cl__shelf_drop(os, baton, pool));
- return SVN_NO_ERROR;
- }
- else if (opt_state->list)
- {
- SVN_ERR(svn_cl__shelf_list(os, baton, pool));
- return SVN_NO_ERROR;
- }
- else if (opt_state->log)
- {
- SVN_ERR(svn_cl__shelf_log(os, baton, pool));
- return SVN_NO_ERROR;
- }
-
SVN_ERR(get_next_argument(&subsubcommand, os, pool, pool));
if (strcmp(subsubcommand, "diff") == 0)
@@ -909,8 +887,7 @@ svn_cl__shelf(apr_getopt_t *os,
else
{
return svn_error_createf(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- _("Unknown shelf command '%s'; "
- "try 'svn help shelf'"),
+ _("Unknown shelf command '%s'"),
subsubcommand);
}
Modified: subversion/branches/shelve-checkpoint/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/svn.c?rev=1821005&r1=1821004&r2=1821005&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/svn.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/svn.c Fri Jan 12 16:39:06 2018
@@ -145,10 +145,7 @@ typedef enum svn_cl__longopt_t {
opt_pin_externals,
opt_show_item,
opt_adds_as_modification,
- opt_vacuum_pristines,
- opt_drop,
- opt_log,
- opt_list
+ opt_vacuum_pristines
} svn_cl__longopt_t;
@@ -474,10 +471,6 @@ const apr_getopt_option_t svn_cl__option
{"vacuum-pristines", opt_vacuum_pristines, 0,
N_("remove unreferenced pristines from .svn directory")},
- {"list", opt_list, 0, N_("list shelves")},
- {"drop", opt_drop, 0, N_("delete a shelf")},
- {"log", opt_log, 0, N_("show versions of a shelf")},
-
/* Long-opt Aliases
*
* These have NULL desriptions, but an option code that matches some
@@ -1692,11 +1685,11 @@ const svn_opt_subcommand_desc2_t svn_cl_
{ "shelf", svn_cl__shelf, {0}, N_
("Examine or manage a shelf.\n"
- "usage: 1. shelf diff | shelf --diff -> see shelf-diff\n"
- " 2. shelf drop | shelf --drop -> see shelf-drop\n"
- " 3. shelf list | shelf --list -> see shelf-list (shelves)\n"
- " 4. shelf log | shelf --log -> see shelf-log\n"
- " 5. shelf save -> see shelf-save\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"
@@ -1705,8 +1698,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" 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_diff, opt_drop, opt_list, opt_log,
- opt_dry_run, 'q',
+ {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,
@@ -2377,12 +2369,6 @@ sub_main(int *exit_code, int argc, const
case opt_dry_run:
opt_state.dry_run = TRUE;
break;
- case opt_list:
- opt_state.list = TRUE;
- break;
- case opt_log:
- opt_state.log = TRUE;
- break;
case opt_revprop:
opt_state.revprop = TRUE;
break;
@@ -2566,7 +2552,6 @@ sub_main(int *exit_code, int argc, const
opt_state.diff.summarize = TRUE;
break;
case opt_remove:
- case opt_drop:
opt_state.remove = TRUE;
break;
case opt_changelist:
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=1821005&r1=1821004&r2=1821005&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/tools/client-side/bash_completion (original)
+++ subversion/branches/shelve-checkpoint/tools/client-side/bash_completion Fri Jan 12 16:39:06 2018
@@ -1025,7 +1025,6 @@ _svn()
;;
shelf)
cmdOpts="diff drop list log save \
- --diff --drop --list --log \
--dry-run \
--depth --targets $cOpts \
-m --message -F --file --encoding --force-log --editor-cmd \