svn commit: r1818285 - in /subversion/branches/shelve-checkpoint: subversion/svn/shelve-cmd.c subversion/svn/svn.c tools/client-side/bash_completion

[ju...@apache.org]

Author: julianfoad
Date: Fri Dec 15 13:16:10 2017
New Revision: 1818285

URL: http://svn.apache.org/viewvc?rev=1818285&view=rev
Log:
On the 'shelve-checkpoint' branch: Rename 'savepoint list' to 'savepoint log'.

* subversion/svn/svn.c
  (svn_cl__cmd_table): Rename 'list' to 'log'. Drop '--list' option.

* subversion/svn/shelve-cmd.c
  (checkpoint_log): Was 'checkpoint_list'.
  (svn_cl__checkpoint): Rename 'list' to 'log'. Drop '--list' option.

* tools/client-side/bash_completion
  (_svn): Rename 'list' to 'log'. Drop '--list' option.

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=1818285&r1=1818284&r2=1818285&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c Fri Dec 15 13:16:10 2017
@@ -167,11 +167,11 @@ shelves_list(const char *local_abspath,
 /* Print info about each checkpoint of the shelf named NAME.
  */
 static svn_error_t *
-checkpoint_list(const char *name,
-                const char *local_abspath,
-                svn_boolean_t diffstat,
-                svn_client_ctx_t *ctx,
-                apr_pool_t *scratch_pool)
+checkpoint_log(const char *name,
+               const char *local_abspath,
+               svn_boolean_t diffstat,
+               svn_client_ctx_t *ctx,
+               apr_pool_t *scratch_pool)
 {
   svn_client_shelf_t *shelf;
   int i;
@@ -649,10 +649,7 @@ svn_cl__checkpoint(apr_getopt_t *os,
   const char *local_abspath;
   const char *name;
 
-  if (opt_state->list)
-    subsubcommand = "list";
-  else
-    SVN_ERR(get_next_argument(&subsubcommand, os, pool, pool));
+  SVN_ERR(get_next_argument(&subsubcommand, os, pool, pool));
 
   SVN_ERR(get_next_argument(&name, os, pool, pool));
 
@@ -665,15 +662,15 @@ svn_cl__checkpoint(apr_getopt_t *os,
   if (opt_state->quiet)
     ctx->notify_func2 = NULL;
 
-  if (strcmp(subsubcommand, "list") == 0)
+  if (strcmp(subsubcommand, "log") == 0)
     {
       if (targets->nelts)
         return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
                                 _("Too many arguments"));
 
-      SVN_ERR(checkpoint_list(name, local_abspath,
-                              ! opt_state->quiet /*diffstat*/,
-                              ctx, pool));
+      SVN_ERR(checkpoint_log(name, local_abspath,
+                             ! opt_state->quiet /*diffstat*/,
+                             ctx, pool));
     }
   else if (strcmp(subsubcommand, "save") == 0)
     {

Modified: subversion/branches/shelve-checkpoint/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/svn.c?rev=1818285&r1=1818284&r2=1818285&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/svn.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/svn.c Fri Dec 15 13:16:10 2017
@@ -1659,7 +1659,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
     ("Save and restore local changes.\n"
      "usage: 1. savepoint save NAME [PATH...]\n"
      "       2. savepoint restore NAME [VERSION]\n"
-     "       3. savepoint list|--list NAME\n"
+     "       3. savepoint log NAME\n"
      "       4. savepoint export NAME [VERSION]\n"
      "\n"
      "  1. Save local changes in the given PATHs as a new version of shelf NAME.\n"
@@ -1684,8 +1684,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      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,
-     opt_list},
-    { {opt_list, N_("list all versions of a shelf")} }
+    }
   },
 
   { "shelve", svn_cl__shelve, {0}, N_

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=1818285&r1=1818284&r2=1818285&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/tools/client-side/bash_completion (original)
+++ subversion/branches/shelve-checkpoint/tools/client-side/bash_completion Fri Dec 15 13:16:10 2017
@@ -1023,7 +1023,7 @@ _svn()
 		cmdOpts="$qOpts $pOpts"
 		;;
 	checkpoint|savepoint|sp)
-		cmdOpts="save restore list --list --dry-run \
+		cmdOpts="save restore log --dry-run \
                          --depth --targets $cOpts \
                          -m --message -F --file --encoding --force-log --editor-cmd \
                          $qOpts $pOpts"