Re: svn commit: r1871916 - /subversion/trunk/subversion/svn/log-cmd.c

2019-12-22 Thread Daniel Shahaf
danie...@apache.org wrote on Mon, 23 Dec 2019 06:50 +00:00:
> 'svn log': Make the --quiet and --diff options not mutually exclusive.
> 
> +++ subversion/trunk/subversion/svn/log-cmd.c Mon Dec 23 06:50:26 2019
> @@ -733,10 +733,6 @@ svn_cl__log(apr_getopt_t *os,
> -  if (opt_state->quiet && opt_state->show_diff)
> -return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
> -_("'quiet' and 'diff' options are "
> -  "mutually exclusive"));

If anyone knows of a reason to keep --quiet and --diff mutually
exclusive, please speak up.  (On users@ this change was determined to be
a good idea, but asking here, too, in case we missed something.)

Cheers,

Daniel


svn commit: r1871916 - /subversion/trunk/subversion/svn/log-cmd.c

2019-12-22 Thread danielsh
Author: danielsh
Date: Mon Dec 23 06:50:26 2019
New Revision: 1871916

URL: http://svn.apache.org/viewvc?rev=1871916=rev
Log:
'svn log': Make the --quiet and --diff options not mutually exclusive.

Suggested by: wuzhouhui

Thread: 
https://mail-archives.apache.org/mod_mbox/subversion-users/201912.mbox/%3C6F22A510-BF0B-48DA-9EBD-BB5A22C720BB%40mails.ucas.ac.cn%3E
Date: Sun, 22 Dec 2019 11:29:35 +0800
From: wuzhouhui 
To: Subversion 
Subject: Why option --diff and -q of svn log are mutually exclusive
Message-Id: <6f22a510-bf0b-48da-9ebd-bb5a22c72...@mails.ucas.ac.cn>

* subversion/svn/log-cmd.c
  (svn_cl__log): As above.

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

Modified: subversion/trunk/subversion/svn/log-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1871916=1871915=1871916=diff
==
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Mon Dec 23 06:50:26 2019
@@ -733,10 +733,6 @@ svn_cl__log(apr_getopt_t *os,
   "XML mode"));
 }
 
-  if (opt_state->quiet && opt_state->show_diff)
-return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
-_("'quiet' and 'diff' options are "
-  "mutually exclusive"));
   if (opt_state->diff.diff_cmd && (! opt_state->show_diff))
 return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
 _("'diff-cmd' option requires 'diff' "