Author: julianfoad Date: Thu Feb 22 12:00:03 2018 New Revision: 1825050 URL: http://svn.apache.org/viewvc?rev=1825050&view=rev Log: Shelving: remove shelving v1 from trunk.
* subversion/include/svn_client.h, subversion/svn/shelf-cmd.c subversion/svn/cl.h: Remove shelving v1. * subversion/libsvn_client/shelve.c, subversion/svn/shelve-cmd.c: Delete these files. Removed: subversion/trunk/subversion/libsvn_client/shelve.c subversion/trunk/subversion/svn/shelve-cmd.c Modified: subversion/trunk/subversion/include/svn_client.h subversion/trunk/subversion/svn/cl.h subversion/trunk/subversion/svn/svn.c Modified: subversion/trunk/subversion/include/svn_client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1825050&r1=1825049&r2=1825050&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_client.h (original) +++ subversion/trunk/subversion/include/svn_client.h Thu Feb 22 12:00:03 2018 @@ -7078,137 +7078,6 @@ svn_client_shelf_list(apr_hash_t **shelf /** @} */ -/** Shelving v1 - * - * @defgroup svn_client_shelve_funcs Client Shelving Functions - * @{ - */ - -/** Shelve a change. - * - * Shelve as @a name the local modifications found by @a paths, @a depth, - * @a changelists. Revert the shelved change from the WC unless @a keep_local - * is true. - * - * If @a dry_run is true, don't actually do it. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -SVN_EXPERIMENTAL -svn_error_t * -svn_client_shelve(const char *name, - const apr_array_header_t *paths, - svn_depth_t depth, - const apr_array_header_t *changelists, - svn_boolean_t keep_local, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool); - -/** Unshelve the shelved change @a name. - * - * @a local_abspath is any path in the WC and is used to find the WC root. - * Rename the shelved patch to add a '.bak' extension unless @a keep is true. - * - * If @a dry_run is true, don't actually do it. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -SVN_EXPERIMENTAL -svn_error_t * -svn_client_unshelve(const char *name, - const char *local_abspath, - svn_boolean_t keep, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool); - -/** Delete the shelved patch @a name. - * - * @a local_abspath is any path in the WC and is used to find the WC root. - * - * If @a dry_run is true, don't actually do it. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -SVN_EXPERIMENTAL -svn_error_t * -svn_client_shelves_delete(const char *name, - const char *local_abspath, - svn_boolean_t dry_run, - svn_client_ctx_t *ctx, - apr_pool_t *pool); - -/** Information about a shelved patch. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -typedef struct svn_client_shelved_patch_info_t -{ - const char *message; /* first line of log message */ - const char *patch_path; /* abspath of the patch file */ - svn_io_dirent2_t *dirent; /* info about the patch file */ - apr_time_t mtime; /* a copy of dirent->mtime */ -} svn_client_shelved_patch_info_t; - -/** Set @a *shelved_patch_infos to a hash, keyed by patch name, of pointers to - * @c svn_client_shelved_patch_info_t structures. - * - * @a local_abspath is any path in the WC and is used to find the WC root. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -SVN_EXPERIMENTAL -svn_error_t * -svn_client_shelves_list(apr_hash_t **shelved_patch_infos, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); - -/** Set @a *affected_paths to a hash with one entry for each path affected - * by the shelf @a name. The hash key is the old path and value is - * the new path, both relative to the WC root. The key and value are the - * same except when a path is moved or copied. - * - * @a local_abspath is any path in the WC and is used to find the WC root. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -SVN_EXPERIMENTAL -svn_error_t * -svn_client_shelf_get_paths(apr_hash_t **affected_paths, - const char *name, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool); - -/** Set @a *has_changes to indicate whether the shelf @a name - * contains any modifications, in other words if svn_client_shelf_get_paths() - * would return a non-empty set of paths. - * - * @a local_abspath is any path in the WC and is used to find the WC root. - * - * @since New in 1.10. - * @warning EXPERIMENTAL. - */ -SVN_EXPERIMENTAL -svn_error_t * -svn_client_shelf_has_changes(svn_boolean_t *has_changes, - const char *name, - const char *local_abspath, - svn_client_ctx_t *ctx, - apr_pool_t *scratch_pool); - -/** @} */ - /** Changelist commands * * @defgroup svn_client_changelist_funcs Client Changelist Functions Modified: subversion/trunk/subversion/svn/cl.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1825050&r1=1825049&r2=1825050&view=diff ============================================================================== --- subversion/trunk/subversion/svn/cl.h (original) +++ subversion/trunk/subversion/svn/cl.h Thu Feb 22 12:00:03 2018 @@ -311,9 +311,6 @@ svn_opt_subcommand_t svn_cl__shelf_save, svn_cl__shelf_shelve, svn_cl__shelf_unshelve, - svn_cl__shelve, - svn_cl__unshelve, - svn_cl__shelves, svn_cl__status, svn_cl__switch, svn_cl__unlock, Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1825050&r1=1825049&r2=1825050&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Thu Feb 22 12:00:03 2018 @@ -61,8 +61,6 @@ #include "svn_private_config.h" -/*#define WITH_SHELVE_V1*/ - /*** Option Processing ***/ /* Add an identifier here for long options that don't have a short @@ -148,11 +146,6 @@ typedef enum svn_cl__longopt_t { opt_show_item, opt_adds_as_modification, opt_vacuum_pristines, -#ifdef WITH_SHELVE_V1 - opt_delete, - opt_keep_shelved, - opt_list -#endif } svn_cl__longopt_t; @@ -478,12 +471,6 @@ const apr_getopt_option_t svn_cl__option {"vacuum-pristines", opt_vacuum_pristines, 0, N_("remove unreferenced pristines from .svn directory")}, -#ifdef WITH_SHELVE_V1 - {"list", opt_list, 0, N_("list shelved patches")}, - {"keep-shelved", opt_keep_shelved, 0, N_("do not delete the shelved patch")}, - {"delete", opt_delete, 0, N_("delete the shelved patch")}, -#endif - /* Long-opt Aliases * * These have NULL desriptions, but an option code that matches some @@ -1696,7 +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} }, -#ifndef WITH_SHELVE_V1 { "shelf-diff", svn_cl__shelf_diff, {0}, N_ ("Show shelved changes as a diff.\n" "usage: shelf-diff NAME [VERSION]\n" @@ -1805,75 +1791,6 @@ const svn_opt_subcommand_desc2_t svn_cl_ " in the next release, and there is no promise of backward compatibility.\n" ), {'q', opt_dry_run} }, -#else - { "shelve", svn_cl__shelve, {0}, N_ - ("Put a local change aside, as if putting it on a shelf.\n" - "usage: 1. shelve [--keep-local] NAME [PATH...]\n" - " 2. shelve --delete NAME\n" - " 3. shelve --list\n" - "\n" - " 1. Save the local change in the given PATHs to a patch file, and\n" - " revert that change from the WC unless '--keep-local' is given.\n" - " If a log message is given with '-m' or '-F', include it at the\n" - " beginning of the patch file.\n" - "\n" - " 2. Delete the shelved change NAME.\n" - " (A backup is kept, named with a '.bak' extension.)\n" - "\n" - " 3. List shelved changes. Include the first line of any log message\n" - " and some details about the contents of the change, unless '-q' is\n" - " given.\n" - "\n" - " The kinds of change you can shelve are those supported by 'svn diff'\n" - " and 'svn patch'. The following are currently NOT supported:\n" - " mergeinfo changes, copies, moves, mkdir, rmdir,\n" - " 'binary' content, uncommittable states\n" - "\n" - " To bring back a shelved change, use 'svn unshelve NAME'.\n" - "\n" - " Shelved changes are stored in <WC>/.svn/shelves/\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_delete, opt_list, 'q', opt_dry_run, opt_keep_local, - 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, - } }, - - { "unshelve", svn_cl__unshelve, {0}, N_ - ("Bring a shelved change back to a local change in the WC.\n" - "usage: 1. unshelve [--keep-shelved] [NAME]\n" - " 2. unshelve --list\n" - "\n" - " 1. Apply the shelved change NAME to the working copy.\n" - " Delete the patch unless the '--keep-shelved' option is given.\n" - " (A backup is kept, named with a '.bak' extension.)\n" - " NAME defaults to the most recent shelved change.\n" - "\n" - " 2. List shelved changes. Include the first line of any log message\n" - " and some details about the contents of the change, unless '-q' is\n" - " given.\n" - "\n" - " Any conflict between the change being unshelved and a change\n" - " already in the WC is handled the same way as by 'svn patch',\n" - " creating a 'reject' file.\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_keep_shelved, opt_list, 'q', opt_dry_run} }, - - { "shelves", svn_cl__shelves, {0}, N_ - ("List shelved changes.\n" - "usage: shelves\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" - ), - {'q'} }, -#endif { "status", svn_cl__status, {"stat", "st"}, N_ ("Print the status of working copy files and directories.\n" @@ -2425,11 +2342,6 @@ sub_main(int *exit_code, int argc, const case opt_dry_run: opt_state.dry_run = TRUE; break; -#ifdef WITH_SHELVE_V1 - case opt_list: - opt_state.list = TRUE; - break; -#endif case opt_revprop: opt_state.revprop = TRUE; break; @@ -2613,9 +2525,6 @@ sub_main(int *exit_code, int argc, const opt_state.diff.summarize = TRUE; break; case opt_remove: -#ifdef WITH_SHELVE_V1 - case opt_delete: -#endif opt_state.remove = TRUE; break; case opt_changelist: @@ -2631,9 +2540,6 @@ sub_main(int *exit_code, int argc, const opt_state.keep_changelists = TRUE; break; case opt_keep_local: -#ifdef WITH_SHELVE_V1 - case opt_keep_shelved: -#endif opt_state.keep_local = TRUE; break; case opt_with_all_revprops: @@ -3147,12 +3053,8 @@ 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 -#ifndef WITH_SHELVE_V1 || subcommand->cmd_func == svn_cl__shelf_save || subcommand->cmd_func == svn_cl__shelf_shelve -#else - || subcommand->cmd_func == svn_cl__shelve -#endif )) { /* If the -F argument is a file that's under revision control,