You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@vmoo.com> on 2010/08/20 17:55:44 UTC
RE: svn commit: r987513 - /subversion/trunk/subversion/svnrdump/svnrdump.c
> -----Original Message-----
> From: artagnon@apache.org [mailto:artagnon@apache.org]
> Sent: vrijdag 20 augustus 2010 7:09
> To: commits@subversion.apache.org
> Subject: svn commit: r987513 -
> /subversion/trunk/subversion/svnrdump/svnrdump.c
>
> Author: artagnon
> Date: Fri Aug 20 14:08:42 2010
> New Revision: 987513
>
> URL: http://svn.apache.org/viewvc?rev=987513&view=rev
> Log:
> * subversion/svnrdump/svnrdump.c
> (load_cmd): Check that we can set revprops before attempting to
> drive the load editor.
>
> Modified:
> subversion/trunk/subversion/svnrdump/svnrdump.c
>
> Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnr
> dump.c?rev=987513&r1=987512&r2=987513&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
> +++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Aug 20 14:08:42
> 2010
> @@ -393,6 +393,17 @@ static svn_error_t *
> load_cmd(apr_getopt_t *os, void *baton, apr_pool_t *pool)
> {
> opt_baton_t *opt_baton = baton;
> + svn_boolean_t can_set_revprops = FALSE;
> +
> + SVN_ERR(svn_ra_has_capability(opt_baton->session,
> &can_set_revprops,
> + "commit-revprops", pool));
> + if(!can_set_revprops)
> + return
> + svn_error_create
> + (SVN_ERR_REPOS_DISABLED_FEATURE, NULL,
> + _("Repository has not been enabled to accept revision propchanges;\n"
> + "ask the administrator to create a pre-revprop-change hook"));
> +
The capability of committing revprops is unrelated to whether we can change revision properties.
In 1.5 we added the option to add a list of revision properties to set directly at commit, and this is what you check here. If you are committing to older repositories you can just set the revision properties after the commit (like you do for svn:author and svn:date).
And if you get a failure on doing that, then you should show this error.
Bert
Re: svn commit: r987513 -
/subversion/trunk/subversion/svnrdump/svnrdump.c
Posted by Ramkumar Ramachandra <ar...@gmail.com>.
Hi Daniel,
Daniel Shahaf writes:
> Ping. Was the 'race condition' I mentioned in my other mail related to
> 'svnrdump load' setting revprop (which may fail if a hook hadn't been
> set up)?
Yep. I have to try setting some dummy revprop and barf out quickly
before getting caught up in between real work like svnsync does.
-- Ram
Re: svn commit: r987513 -
/subversion/trunk/subversion/svnrdump/svnrdump.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Ping. Was the 'race condition' I mentioned in my other mail related to
'svnrdump load' setting revprop (which may fail if a hook hadn't been
set up)?
Bert Huijben wrote on Fri, Aug 20, 2010 at 10:55:44 -0700:
>
>
> > -----Original Message-----
> > From: artagnon@apache.org [mailto:artagnon@apache.org]
> > Sent: vrijdag 20 augustus 2010 7:09
> > To: commits@subversion.apache.org
> > Subject: svn commit: r987513 -
> > /subversion/trunk/subversion/svnrdump/svnrdump.c
> >
> > Author: artagnon
> > Date: Fri Aug 20 14:08:42 2010
> > New Revision: 987513
> >
> > URL: http://svn.apache.org/viewvc?rev=987513&view=rev
> > Log:
> > * subversion/svnrdump/svnrdump.c
> > (load_cmd): Check that we can set revprops before attempting to
> > drive the load editor.
> >
> > Modified:
> > subversion/trunk/subversion/svnrdump/svnrdump.c
> >
> > Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
> > URL:
> > http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnr
> > dump.c?rev=987513&r1=987512&r2=987513&view=diff
> > ==========================================================
> > ====================
> > --- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
> > +++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Aug 20 14:08:42
> > 2010
> > @@ -393,6 +393,17 @@ static svn_error_t *
> > load_cmd(apr_getopt_t *os, void *baton, apr_pool_t *pool)
> > {
> > opt_baton_t *opt_baton = baton;
> > + svn_boolean_t can_set_revprops = FALSE;
> > +
> > + SVN_ERR(svn_ra_has_capability(opt_baton->session,
> > &can_set_revprops,
> > + "commit-revprops", pool));
> > + if(!can_set_revprops)
> > + return
> > + svn_error_create
> > + (SVN_ERR_REPOS_DISABLED_FEATURE, NULL,
> > + _("Repository has not been enabled to accept revision propchanges;\n"
> > + "ask the administrator to create a pre-revprop-change hook"));
> > +
>
> The capability of committing revprops is unrelated to whether we can change revision properties.
>
> In 1.5 we added the option to add a list of revision properties to set directly at commit, and this is what you check here. If you are committing to older repositories you can just set the revision properties after the commit (like you do for svn:author and svn:date).
>
> And if you get a failure on doing that, then you should show this error.
>
> Bert
>
>