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

Re: svn commit: r22296 - in trunk/subversion: libsvn_client svn tests/cmdline

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-11-14 02:30:42 CET

In notify.c we explicitly avoid converting paths which are URLs to
local style. However, in update.c, we do convert a path which is a
URL to local style for use in the error message we return. Is this
correct?

- Dan

On Mon, 13 Nov 2006, lgo@tigris.org wrote:
...
> Don't try to update URL's. Not only doesn't that make any sense, it
> will result in assert exceptions when the url is of the 'scheme://hostname'
> form.
>
> * subversion/libsvn_client/update.c
> (svn_client__update_internal): skip url's during update
>
> * subversion/libsvn_wc/notify.c
> (notify): don't convert url's to local style
...
> --- trunk/subversion/libsvn_client/update.c (original)
> +++ trunk/subversion/libsvn_client/update.c Mon Nov 13 15:24:42 2006
> @@ -73,6 +73,11 @@
> /* Sanity check. Without this, the update is meaningless. */
> assert(path);
>
> + if (svn_path_is_url(path))
> + return svn_error_createf(SVN_ERR_WC_NOT_DIRECTORY, NULL,
> + _("Path '%s' is not a directory"),
> + svn_path_local_style(path, pool));
> +
...
> --- trunk/subversion/svn/notify.c (original)
> +++ trunk/subversion/svn/notify.c Mon Nov 13 15:24:42 2006
> @@ -58,7 +58,10 @@
> const char *path_local;
> svn_error_t *err;
>
> - path_local = svn_path_local_style(n->path, pool);
> + if (svn_path_is_url(n->path))
> + path_local = n->path;
> + else
> + path_local = svn_path_local_style(n->path, pool);
...

  • application/pgp-signature attachment: stored
Received on Tue Nov 14 02:32:12 2006

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