svn commit: r1820047 - in /subversion/trunk/subversion/svn: shelve-cmd.c svn.c

[ju...@apache.org]

Author: julianfoad
Date: Thu Jan  4 09:59:20 2018
New Revision: 1820047

URL: http://svn.apache.org/viewvc?rev=1820047&view=rev
Log:
Let 'svn shelves' accept '-q' for consistency with 'svn shelve --list -q'.

* subversion/svn/svn.c
  (svn_cl__cmd_table): Let 'svn shelves' accept '-q'.

* subversion/svn/shelve-cmd.c
  (svn_cl__shelves): Pass the 'quiet' option through.

Modified:
    subversion/trunk/subversion/svn/shelve-cmd.c
    subversion/trunk/subversion/svn/svn.c

Modified: subversion/trunk/subversion/svn/shelve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/shelve-cmd.c?rev=1820047&r1=1820046&r2=1820047&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/shelve-cmd.c (original)
+++ subversion/trunk/subversion/svn/shelve-cmd.c Thu Jan  4 09:59:20 2018
@@ -316,6 +316,7 @@ svn_cl__shelves(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;
   svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
   const char *local_abspath;
 
@@ -324,7 +325,8 @@ svn_cl__shelves(apr_getopt_t *os,
     return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL);
 
   SVN_ERR(svn_dirent_get_absolute(&local_abspath, "", pool));
-  SVN_ERR(shelves_list(local_abspath, TRUE /*diffstat*/, ctx, pool));
+  SVN_ERR(shelves_list(local_abspath, ! opt_state->quiet /*diffstat*/,
+                       ctx, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1820047&r1=1820046&r2=1820047&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Thu Jan  4 09:59:20 2018
@@ -1756,7 +1756,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"
     ),
-    },
+    {'q'} },
 
   { "status", svn_cl__status, {"stat", "st"}, N_
     ("Print the status of working copy files and directories.\n"