[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r36869 - trunk/subversion/libsvn_client

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Mon, 30 Mar 2009 16:32:53 -0500

On Mar 30, 2009, at 4:18 PM, Greg Stein wrote:

> On Mon, Mar 30, 2009 at 22:22, Hyrum K. Wright
> <hyrum_at_hyrumwright.org> wrote:
>> ...
>> +++ trunk/subversion/libsvn_client/cat.c Mon Mar 30 13:22:55
>> 2009 (r36869)
>> @@ -28,6 +28,7 @@
>> #include "svn_subst.h"
>> #include "svn_io.h"
>> #include "svn_time.h"
>> +#include "svn_dirent_uri.h"
>> #include "svn_path.h"
>> #include "svn_props.h"
>> #include "client.h"
>> @@ -181,8 +182,10 @@ svn_client_cat2(svn_stream_t *out,
>> svn_wc_adm_access_t *adm_access;
>>
>> SVN_ERR(svn_wc_adm_open3(&adm_access, NULL,
>> - svn_path_dirname(path_or_url,
>> pool), FALSE,
>> - 0, ctx->cancel_func, ctx-
>> >cancel_baton,
>> + svn_path_is_url(path_or_url)
>> + ? svn_uri_dirname(path_or_url,
>> pool)
>> + : svn_dirent_dirname(path_or_url,
>> pool),
>> + FALSE, 0, ctx->cancel_func, ctx-
>> >cancel_baton,
>> pool));
>
> Eesh... seriously. How can you pass a URL to svn_wc_adm_open3() ?
>
> Were you looking at the variable name too much?
>
> Or maybe missed the svn_path_is_url() call on the conditional for this
> block of code?

I was just looking at the variable name. It turns out this is in a
block meant only for local paths, so the conditional here is
redundant. r36872.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1486377
Received on 2009-03-30 23:33:12 CEST

This is an archived mail posted to the Subversion Dev mailing list.