Karl Fogel wrote on Mon, 15 Sep 2008 at 18:10 -0400:
> Daniel Shahaf <d.s_at_daniel.shahaf.name> writes:
> > I looked at the patch earlier today, and had just one minor issue (too
> > minor to post about separately then):
> >
> > Don't we want to add a check that --with-no-revprops and either
> > --with-revprop or --with-all-revprops aren't used together? That is,
> > 'svn log --with-no-revprops --with-all-revprops' should be disallowed.
>
> Hmmm. Yes, that would be a good idea. r33086 :-).
>
> -Karl
Thanks, but you still allow "--with-no-revprops --with-revprop".
(If you read my original mail very very carefully, you'll see that I
did say this then. :) ) Here's a patch:
[[[
* subversion/svn/main.c
(main): Disallow simultaneous use of --with-no-revprops and
--with-revprop, following up to r33085.
]]]
Index: main.c
===================================================================
--- main.c (revision 33086)
+++ main.c (working copy)
@@ -1653,6 +1653,16 @@
return svn_cmdline_handle_exit_error(err, pool, "svn: ");
}
+ /* Disallow simultaneous use of both --with-revprop and
+ --with-no-revprops. */
+ if (opt_state.revprop_table && opt_state.no_revprops)
+ {
+ err = svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("--with-revprop and --with-no-revprops "
+ "are mutually exclusive"));
+ return svn_cmdline_handle_exit_error(err, pool, "svn: ");
+ }
+
/* --trust-server-cert can only be used with --non-interactive */
if (opt_state.trust_server_cert && !opt_state.non_interactive)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-16 00:44:02 CEST