You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2018/01/31 04:00:06 UTC
svn commit: r1822731 - in /subversion/branches/1.10.x: ./ STATUS
subversion/svn/shelve-cmd.c subversion/svn/svn.c
tools/client-side/bash_completion
Author: svn-role
Date: Wed Jan 31 04:00:06 2018
New Revision: 1822731
URL: http://svn.apache.org/viewvc?rev=1822731&view=rev
Log:
Merge the r1820046 group from trunk:
* r1820046,r1820047
Let 'svn shelves' accept '-q' for consistency with 'svn shelve --list -q'.
Votes:
+1: julianfoad, rhuijben, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/svn/shelve-cmd.c
subversion/branches/1.10.x/subversion/svn/svn.c
subversion/branches/1.10.x/tools/client-side/bash_completion
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 31 04:00:06 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820518,1820718,1821183,1821224
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820046-1820047,1820518,1820718,1821183,1821224
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1822731&r1=1822730&r2=1822731&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Jan 31 04:00:06 2018
@@ -40,11 +40,6 @@ Candidate changes:
Approved changes:
=================
- * r1820046,r1820047
- Let 'svn shelves' accept '-q' for consistency with 'svn shelve --list -q'.
- Votes:
- +1: julianfoad, rhuijben, jamessan
-
* r1821621
Remove lower level shelving functions from (experimental) public API.
Votes:
@@ -62,4 +57,3 @@ Approved changes:
Veto-blocked changes:
=====================
-
Modified: subversion/branches/1.10.x/subversion/svn/shelve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/shelve-cmd.c?rev=1822731&r1=1822730&r2=1822731&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/1.10.x/subversion/svn/shelve-cmd.c Wed Jan 31 04:00:06 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/branches/1.10.x/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/svn.c?rev=1822731&r1=1822730&r2=1822731&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.10.x/subversion/svn/svn.c Wed Jan 31 04:00:06 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"
Modified: subversion/branches/1.10.x/tools/client-side/bash_completion
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/tools/client-side/bash_completion?rev=1822731&r1=1822730&r2=1822731&view=diff
==============================================================================
--- subversion/branches/1.10.x/tools/client-side/bash_completion (original)
+++ subversion/branches/1.10.x/tools/client-side/bash_completion Wed Jan 31 04:00:06 2018
@@ -1028,7 +1028,7 @@ _svn()
cmdOpts="$qOpts --keep-shelved --list --dry-run $pOpts"
;;
shelves)
- cmdOpts="$pOpts"
+ cmdOpts="$qOpts $pOpts"
;;
*)
;;