You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/10/31 10:56:26 UTC
Re: svn commit: r40317 - trunk/subversion/libsvn_client
On Fri, Oct 30, 2009 at 15:13, Paul T. Burba <pb...@collab.net> wrote:
>...
> +++ trunk/subversion/libsvn_client/commit_util.c Fri Oct 30 12:13:01 2009 (r40317)
> @@ -1021,18 +1021,18 @@ svn_client__harvest_committables(apr_has
> {
> const char *parent_abspath = svn_dirent_dirname(target_abspath,
> subpool);
> - const svn_wc_entry_t *p_entry;
> + svn_boolean_t is_added;
>
> - SVN_ERR(svn_wc__maybe_get_entry(&p_entry, ctx->wc_ctx,
> - parent_abspath, svn_node_dir,
> - FALSE, FALSE, subpool, subpool));
> - if (! p_entry)
> + err = svn_wc__node_is_status_added(&is_added, ctx->wc_ctx,
> + parent_abspath, subpool);
> + if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
> return svn_error_createf
> (SVN_ERR_WC_CORRUPT, NULL,
> - _("'%s' is scheduled for addition within unversioned parent"),
> - svn_dirent_local_style(target, pool));
> - if ((p_entry->schedule == svn_wc_schedule_add)
> - || (p_entry->schedule == svn_wc_schedule_replace))
> + _("'%s' is scheduled for addition within unversioned parent"),
> + svn_dirent_local_style(target, pool));
> + SVN_ERR(err);
err is leaked in the PATH_NOT_FOUND case.
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413207
Re: svn commit: r40317 - trunk/subversion/libsvn_client
Posted by Paul Burba <pt...@gmail.com>.
On Sat, Oct 31, 2009 at 5:56 AM, Greg Stein <gs...@gmail.com> wrote:
> On Fri, Oct 30, 2009 at 15:13, Paul T. Burba <pb...@collab.net> wrote:
>>...
>> +++ trunk/subversion/libsvn_client/commit_util.c Fri Oct 30 12:13:01 2009 (r40317)
>> @@ -1021,18 +1021,18 @@ svn_client__harvest_committables(apr_has
>> {
>> const char *parent_abspath = svn_dirent_dirname(target_abspath,
>> subpool);
>> - const svn_wc_entry_t *p_entry;
>> + svn_boolean_t is_added;
>>
>> - SVN_ERR(svn_wc__maybe_get_entry(&p_entry, ctx->wc_ctx,
>> - parent_abspath, svn_node_dir,
>> - FALSE, FALSE, subpool, subpool));
>> - if (! p_entry)
>> + err = svn_wc__node_is_status_added(&is_added, ctx->wc_ctx,
>> + parent_abspath, subpool);
>> + if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
>> return svn_error_createf
>> (SVN_ERR_WC_CORRUPT, NULL,
>> - _("'%s' is scheduled for addition within unversioned parent"),
>> - svn_dirent_local_style(target, pool));
>> - if ((p_entry->schedule == svn_wc_schedule_add)
>> - || (p_entry->schedule == svn_wc_schedule_replace))
>> + _("'%s' is scheduled for addition within unversioned parent"),
>> + svn_dirent_local_style(target, pool));
>> + SVN_ERR(err);
>
> err is leaked in the PATH_NOT_FOUND case.
Hi Greg,
Cleared that error in r40352.
Paul
> Cheers,
> -g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413825