On Sun, Mar 1, 2009 at 18:05, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>...
> +++ trunk/subversion/libsvn_wc/status.c Sun Mar 1 09:05:15 2009 (r36219)
>...
> @@ -376,7 +377,7 @@ assemble_status(svn_wc_status2_t **statu
>
> switched_p = (strcmp(
> svn_path_join(parent_entry->url,
> - svn_path_uri_encode(svn_path_basename(path, pool),
> + svn_path_uri_encode(svn_uri_basename(path, pool),
> pool), pool), entry->url) != 0);
path is a dirent. That should be svn_dirent_basename().
>...
> +++ trunk/subversion/libsvn_wc/update_editor.c Sun Mar 1 09:05:15 2009 (r36219)
>...
> @@ -529,7 +529,7 @@ make_dir_baton(struct dir_baton **d_p,
> if (path)
> {
> d->path = svn_path_join(d->path, path, pool);
> - d->name = svn_path_basename(path, pool);
> + d->name = svn_uri_basename(path, pool);
path is joined with d->path which is dup of eb->anchor which is
defined as "relative to CWD". Therefore, these are all dirent values.
More precisely, path is an internal-format *relative* value which is
the same whether a dirent or a uri.
>...
> @@ -931,7 +931,7 @@ make_file_baton(struct file_baton **f_p,
>
> /* Make the file's on-disk name. */
> f->path = svn_path_join(pb->edit_baton->anchor, path, pool);
> - f->name = svn_path_basename(path, pool);
> + f->name = svn_uri_basename(path, pool);
Again, if it is joined with the anchor, then it is a dirent.
(and again, only strictly speaking, since a relative path could be either)
>...
> @@ -2157,7 +2157,7 @@ delete_entry(const char *path,
> apr_pool_t *pool)
> {
> struct dir_baton *pb = parent_baton;
> - const char *path_basename = svn_path_basename(path, pool);
> + const char *path_basename = svn_uri_basename(path, pool);
> const char *their_url = svn_path_url_add_component2(pb->new_URL,
> path_basename, pool);
same thing. another path relative to eb->anchor, therefore (strictly) a dirent.
>...
> @@ -2930,7 +2930,7 @@ absent_file_or_dir(const char *path,
> void *parent_baton,
> apr_pool_t *pool)
> {
> - const char *name = svn_path_basename(path, pool);
> + const char *name = svn_uri_basename(path, pool);
And again.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1251620
Received on 2009-03-01 19:02:15 CET