You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/09 22:50:29 UTC
svn commit: r1090685 - /subversion/trunk/subversion/libsvn_client/commit.c
Author: rhuijben
Date: Sat Apr 9 20:50:29 2011
New Revision: 1090685
URL: http://svn.apache.org/viewvc?rev=1090685&view=rev
Log:
* subversion/libsvn_client/commit.c
(collect_lock_tokens): Use svn_uri_* functions instead of a local
reimplementation.
Modified:
subversion/trunk/subversion/libsvn_client/commit.c
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1090685&r1=1090684&r2=1090685&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Sat Apr 9 20:50:29 2011
@@ -899,13 +899,11 @@ collect_lock_tokens(apr_hash_t **result,
const char *url = svn__apr_hash_index_key(hi);
const char *token = svn__apr_hash_index_val(hi);
- if (strncmp(base_url, url, base_len) == 0
- && (url[base_len] == '\0' || url[base_len] == '/'))
+ if (svn_uri_is_ancestor(base_url, url))
{
- if (url[base_len] == '\0')
- url = "";
- else
- url = svn_path_uri_decode(url + base_len + 1, pool);
+ url = svn_path_uri_decode(svn_uri_skip_ancestor(base_url, url),
+ pool);
+
apr_hash_set(*result, url, APR_HASH_KEY_STRING, token);
}
}