You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2008/09/15 21:45:54 UTC
Re: svn commit: r33085 - in trunk:
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.
Daniel
kfogel@tigris.org wrote on Mon, 15 Sep 2008 at 14:35 -0700:
> Author: kfogel
> Date: Mon Sep 15 14:35:55 2008
> New Revision: 33085
>
> Log:
> Add new command line switch "--with-no-revprops" to the svn log CLI.
> Extend the DAV protocol with a "no-revprops" flag, and update ra_serf
> and ra_neon to send this flag if the revprops array is empty. This
> brings the DAV protocol on par with the SVN protocol, and exposes this
> functionality to command line users.
>
> Patch by: Eirik Bjørsnøs <ei...@public.gmane.org>
> (Only very minor tweaks by me, such as updating the getopt test data.)
>
> * subversion/mod_dav_svn/reports/log.c
> (dav_svn__log_report): Read "no-revprops" and leave an empty array
> of rev-props to fetch.
>
> * subversion/libsvn_ra_serf/log.c
> (svn_ra_serf__get_log): Add "<no-revprops/>" to log report request
> if revprops array is empty.
>
> * subversion/libsvn_ra_neon/log.c
> (svn_ra_neon__get_log): Add "<no-revprops/>" to log report request
> if revprops array is empty.
>
> * subversion/svn/cl.h
> (svn_cl__opt_state_t): Add no_revprops. Fix existing comment, too.
>
> * subversion/svn/log-cmd.c
> (svn_cl__log): Check for --with-no-revprops only being used in XML mode.
> (svn_cl__log): Create an empty revprops array if no_revprops is set.
>
> * subversion/svn/main.c
> (svn_cl__longopt_t) Add opt_with_no_revprops
> (svn_cl__options) Add "with-no-revprops" option
> (main) Check for opt_with_no_revprops being set
>
> * notes/webdav-protocol
> (log-report) Add "no-revprops" option
>
> * subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
> Adjust for above.
>
> Modified:
> trunk/notes/webdav-protocol
> trunk/subversion/libsvn_ra_neon/log.c
> trunk/subversion/libsvn_ra_serf/log.c
> trunk/subversion/mod_dav_svn/reports/log.c
> trunk/subversion/svn/cl.h
> trunk/subversion/svn/log-cmd.c
> trunk/subversion/svn/main.c
> trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Re: svn commit: r33085 - in trunk:
Posted by Karl Fogel <kf...@red-bean.com>.
Daniel Shahaf <d....@daniel.shahaf.name> writes:
> Karl Fogel wrote on Mon, 15 Sep 2008 at 18:10 -0400:
>> Daniel Shahaf <d....@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:
Oops. r33099, and thanks for noticing.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33085 - in trunk:
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Karl Fogel wrote on Mon, 15 Sep 2008 at 18:10 -0400:
> Daniel Shahaf <d....@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33085 - in trunk:
Posted by Karl Fogel <kf...@red-bean.com>.
Daniel Shahaf <d....@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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org