You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/03/02 20:57:23 UTC
svn commit: r1296419 - /subversion/trunk/subversion/libsvn_client/commit.c
Author: hwright
Date: Fri Mar 2 19:57:22 2012
New Revision: 1296419
URL: http://svn.apache.org/viewvc?rev=1296419&view=rev
Log:
Block out some code which is only required for the Ev2 shims, but which was
causing a test fail of commit-26. This is a followup to r1296045.
* subversion/libsvn_client/commit.c
(get_ra_editor): Don't calculate the anchor_abspath if we're not running
with the shims enabled.
Modified:
subversion/trunk/subversion/libsvn_client/commit.c
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1296419&r1=1296418&r2=1296419&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Mar 2 19:57:22 2012
@@ -671,6 +671,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
SVN_ERR(svn_client__ensure_revprop_table(&commit_revprops, revprop_table,
log_msg, ctx, pool));
+#ifdef ENABLE_EDITOR_SHIMS
/* We need this for the shims. */
if (base_dir_abspath)
{
@@ -686,6 +687,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
}
else
anchor_abspath = NULL;
+#endif
/* Fetch RA commit editor. */
SVN_ERR(svn_ra__register_editor_shim_callbacks(*ra_session,
Re: svn commit: r1296419 - /subversion/trunk/subversion/libsvn_client/commit.c
Posted by Hyrum K Wright <hy...@wandisco.com>.
On Fri, Mar 2, 2012 at 1:59 PM, Greg Stein <gs...@gmail.com> wrote:
> On Fri, Mar 2, 2012 at 14:57, <hw...@apache.org> wrote:
>>...
>> +++ subversion/trunk/subversion/libsvn_client/commit.c Fri Mar 2 19:57:22 2012
>> @@ -671,6 +671,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
>> SVN_ERR(svn_client__ensure_revprop_table(&commit_revprops, revprop_table,
>> log_msg, ctx, pool));
>>
>> +#ifdef ENABLE_EDITOR_SHIMS
>> /* We need this for the shims. */
>> if (base_dir_abspath)
>> {
>> @@ -686,6 +687,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
>> }
>> else
>> anchor_abspath = NULL;
>> +#endif
>
> This will only work if you build with -DENABLE_EDITOR_SHIMS ... when I
> did testing, I merely defined it within compat.c. ... if I try that
> now, I'm not going to get this code :-(
True, though I hope we can figure out how to fix this issue long-term
relatively soon.
-Hyrum
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Re: svn commit: r1296419 - /subversion/trunk/subversion/libsvn_client/commit.c
Posted by Greg Stein <gs...@gmail.com>.
On Fri, Mar 2, 2012 at 14:57, <hw...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/commit.c Fri Mar 2 19:57:22 2012
> @@ -671,6 +671,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
> SVN_ERR(svn_client__ensure_revprop_table(&commit_revprops, revprop_table,
> log_msg, ctx, pool));
>
> +#ifdef ENABLE_EDITOR_SHIMS
> /* We need this for the shims. */
> if (base_dir_abspath)
> {
> @@ -686,6 +687,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
> }
> else
> anchor_abspath = NULL;
> +#endif
This will only work if you build with -DENABLE_EDITOR_SHIMS ... when I
did testing, I merely defined it within compat.c. ... if I try that
now, I'm not going to get this code :-(
Cheers,
-g
Re: svn commit: r1296419 - /subversion/trunk/subversion/libsvn_client/commit.c
Posted by Greg Stein <gs...@gmail.com>.
On Fri, Mar 2, 2012 at 14:57, <hw...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/commit.c Fri Mar 2 19:57:22 2012
> @@ -671,6 +671,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
> SVN_ERR(svn_client__ensure_revprop_table(&commit_revprops, revprop_table,
> log_msg, ctx, pool));
>
> +#ifdef ENABLE_EDITOR_SHIMS
> /* We need this for the shims. */
> if (base_dir_abspath)
> {
> @@ -686,6 +687,7 @@ get_ra_editor(svn_ra_session_t **ra_sess
> }
> else
> anchor_abspath = NULL;
> +#endif
>
> /* Fetch RA commit editor. */
> SVN_ERR(svn_ra__register_editor_shim_callbacks(*ra_session,
The above code will pass an uninitialized ANCHOR_ABSPATH into
svn_ra__register_editor_shim_callbacks().
I'd suggested shifting the #endif down a few lines.
Cheers,
-g