On Mon, Nov 10, 2008 at 10:19 AM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> David Glasser wrote:
>> On Mon, Nov 10, 2008 at 9:00 AM, <rhuijben_at_tigris.org> wrote:
>>> Author: rhuijben
>>> Date: Mon Nov 10 09:00:10 2008
>>> New Revision: 34131
>>>
>>> Log:
>>> Convert repository path in SVN_ERR_FS_ALREADY_EXISTS template to local style.
>>
>> Wait, really? I thought we try to consistently use '/' for
>> repository-style paths.
>
> If you read the patch...
Oops, my apologies.
--dave
>>> Modified: trunk/subversion/include/private/svn_fs_util.h
>>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/private/svn_fs_util.h?pathrev=34131&r1=34130&r2=34131
>>> ==============================================================================
>>> --- trunk/subversion/include/private/svn_fs_util.h Mon Nov 10 08:39:54 2008 (r34130)
>>> +++ trunk/subversion/include/private/svn_fs_util.h Mon Nov 10 09:00:10 2008 (r34131)
>>> @@ -63,17 +63,18 @@ svn_fs__check_fs(svn_fs_t *fs, svn_boole
>>>
>>> /* Build a detailed `file already exists' message for PATH in ROOT.
>>> ROOT is of type svn_fs_root_t *. */
>>> -#define SVN_FS__ALREADY_EXISTS(root, path_str) ( \
>>> +#define SVN_FS__ALREADY_EXISTS(root, path_str, pool) ( \
>>> root->is_txn_root ? \
>>> svn_error_createf \
>>> (SVN_ERR_FS_ALREADY_EXISTS, 0, \
>>> _("File already exists: filesystem '%s', transaction '%s', path '%s'"), \
>>> - root->fs->path, root->txn, path_str) \
>>> + svn_path_local_style(root->fs->path), root->txn, path_str) \
>>> : \
>>> svn_error_createf \
>>> (SVN_ERR_FS_ALREADY_EXISTS, 0, \
>>> _("File already exists: filesystem '%s', revision %ld, path '%s'"), \
>>> - root->fs->path, root->rev, path_str) \
>>> + svn_path_local_style(root->fs->path), root->fs->path, root->rev, \
>>> + path_str) \
>>> )
>
> ...you see that he's only translating the location of the filesystem itself,
> not the versioned path *within* the virtual filesystem, to local style.
> That's an acceptable change.
>
> Of course, passing in a pool argument that doesn't get used even for new
> function calls which require it is *not* so acceptable. :-P
>
> --
> C. Michael Pilato <cmpilato_at_collab.net>
> CollabNet <> www.collab.net <> Distributed Development On Demand
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-10 20:06:06 CET