You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/01/20 23:41:07 UTC
svn commit: r1061556 - in /subversion/branches/uris-as-urls:
subversion/libsvn_ra/ subversion/svnrdump/ subversion/tests/cmdline/
subversion/tests/libsvn_client/ subversion/tests/libsvn_ra_local/
subversion/tests/libsvn_wc/ tools/client-side/svnmucc/
Author: cmpilato
Date: Thu Jan 20 22:41:06 2011
New Revision: 1061556
URL: http://svn.apache.org/viewvc?rev=1061556&view=rev
Log:
On the 'uris-as-urls' branch, review and correct some use of the
svn_uri_* APIs. (One step of many similar ones.)
* subversion/libsvn_ra/compat.c
(svn_ra__file_revs_from_log): Review, correct (as needed), and rename uses of the svn_uri_* API.
* subversion/libsvn_ra/ra_loader.c
(svn_ra_open4, svn_ra_reparent, svn_ra_get_path_relative_to_session,
svn_ra_get_path_relative_to_root): Same as above.
* tools/client-side/svnmucc/svnmucc.c
(subtract_anchor): Same as above.
* subversion/tests/libsvn_ra_local/ra-local-test.c
(make_and_open_local_repos, check_split_url): Same as above.
* subversion/tests/libsvn_wc/op-depth-test.c
(repo_wc_copies): Same as above.
* subversion/tests/libsvn_wc/entries-compat.c
(test_access_baton_like_locking): Same as above.
* subversion/tests/libsvn_wc/utils.c
(svn_test__create_repos_and_wc): Same as above.
* subversion/tests/libsvn_client/client-test.c
(test_patch, test_wc_add_scenarios, test_copy_crash): Same as above.
* subversion/tests/cmdline/atomic-ra-revprop-change.c
(main): Same as above.
* subversion/svnrdump/svnrdump.c
(main): Same as above.
Modified:
subversion/branches/uris-as-urls/subversion/libsvn_ra/compat.c
subversion/branches/uris-as-urls/subversion/libsvn_ra/ra_loader.c
subversion/branches/uris-as-urls/subversion/svnrdump/svnrdump.c
subversion/branches/uris-as-urls/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/branches/uris-as-urls/subversion/tests/libsvn_client/client-test.c
subversion/branches/uris-as-urls/subversion/tests/libsvn_ra_local/ra-local-test.c
subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/utils.c
subversion/branches/uris-as-urls/tools/client-side/svnmucc/svnmucc.c
Modified: subversion/branches/uris-as-urls/subversion/libsvn_ra/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_ra/compat.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_ra/compat.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_ra/compat.c Thu Jan 20 22:41:06 2011
@@ -674,7 +674,7 @@ svn_ra__file_revs_from_log(svn_ra_sessio
SVN_ERR(svn_ra_get_session_url(ra_session, &session_url, pool));
/* Create the initial path, using the repos_url and session_url */
- tmp = svn_uri_is_child(repos_url, session_url, pool);
+ tmp = svn_url_is_child(repos_url, session_url, pool);
repos_abs_path = apr_palloc(pool, strlen(tmp) + 1);
repos_abs_path[0] = '/';
memcpy(repos_abs_path + 1, tmp, strlen(tmp));
Modified: subversion/branches/uris-as-urls/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_ra/ra_loader.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_ra/ra_loader.c Thu Jan 20 22:41:06 2011
@@ -513,7 +513,7 @@ svn_error_t *svn_ra_open4(svn_ra_session
corrected_URI.path = (char *)corrected_url;
corrected_url = apr_uri_unparse(pool, &corrected_URI, 0);
}
- *corrected_url_p = svn_uri_canonicalize(corrected_url, pool);
+ *corrected_url_p = svn_url_canonicalize(corrected_url, pool);
svn_pool_destroy(sesspool);
return SVN_NO_ERROR;
}
@@ -547,7 +547,7 @@ svn_error_t *svn_ra_reparent(svn_ra_sess
/* Make sure the new URL is in the same repository, so that the
implementations don't have to do it. */
SVN_ERR(svn_ra_get_repos_root2(session, &repos_root, pool));
- if (! svn_uri_is_ancestor(repos_root, url))
+ if (! svn_url_is_ancestor(repos_root, url))
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't in the same repository as '%s'"),
url, repos_root);
@@ -575,7 +575,7 @@ svn_error_t *svn_ra_get_path_relative_to
}
else
{
- *rel_path = svn_uri_is_child(sess_url, url, pool);
+ *rel_path = svn_url_is_child(sess_url, url, pool);
if (! *rel_path)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't a child of session URL '%s'"),
@@ -598,7 +598,7 @@ svn_error_t *svn_ra_get_path_relative_to
}
else
{
- *rel_path = svn_uri_is_child(root_url, url, pool);
+ *rel_path = svn_url_is_child(root_url, url, pool);
if (! *rel_path)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't a child of repository root "
Modified: subversion/branches/uris-as-urls/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/svnrdump/svnrdump.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/uris-as-urls/subversion/svnrdump/svnrdump.c Thu Jan 20 22:41:06 2011
@@ -889,7 +889,7 @@ main(int argc, const char **argv)
SVNRDUMP_ERR(svn_utf_cstring_to_utf8(&(opt_baton->url),
os->argv[os->ind], pool));
- opt_baton->url = svn_uri_canonicalize(os->argv[os->ind], pool);
+ opt_baton->url = svn_url_canonicalize(os->argv[os->ind], pool);
SVNRDUMP_ERR(open_connection(&(opt_baton->session),
opt_baton->url,
Modified: subversion/branches/uris-as-urls/subversion/tests/cmdline/atomic-ra-revprop-change.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/tests/cmdline/atomic-ra-revprop-change.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/tests/cmdline/atomic-ra-revprop-change.c (original)
+++ subversion/branches/uris-as-urls/subversion/tests/cmdline/atomic-ra-revprop-change.c Thu Jan 20 22:41:06 2011
@@ -236,7 +236,7 @@ main(int argc, const char *argv[])
pool = svn_pool_create(NULL);
/* Parse argv. */
- url = svn_uri_canonicalize(argv[1], pool);
+ url = svn_url_canonicalize(argv[1], pool);
revision = strtol(argv[2], &digits_end, 10);
propname = argv[3];
SVN_INT_ERR(extract_values_from_skel(&old_propval, &propval, argv[4], pool));
Modified: subversion/branches/uris-as-urls/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/tests/libsvn_client/client-test.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/branches/uris-as-urls/subversion/tests/libsvn_client/client-test.c Thu Jan 20 22:41:06 2011
@@ -345,7 +345,7 @@ test_patch(const svn_test_opts_t *opts,
/* Check out the HEAD revision */
SVN_ERR(svn_dirent_get_absolute(&cwd, "", pool));
- SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_url, "test-patch-repos",
+ SVN_ERR(svn_url_get_file_url_from_dirent(&repos_url, "test-patch-repos",
pool));
/* Put wc inside an unversioned directory. Checking out a 1.7 wc
@@ -433,7 +433,7 @@ test_wc_add_scenarios(const svn_test_opt
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &committed_rev, txn, pool));
SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(committed_rev));
- SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_url, "test-wc-add-repos",
+ SVN_ERR(svn_url_get_file_url_from_dirent(&repos_url, "test-wc-add-repos",
pool));
SVN_ERR(svn_dirent_get_absolute(&wc_path, "test-wc-add", pool));
@@ -578,7 +578,7 @@ test_copy_crash(const svn_test_opts_t *o
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &committed_rev, txn, pool));
SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(committed_rev));
- SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_url, "test-copy-crash",
+ SVN_ERR(svn_url_get_file_url_from_dirent(&repos_url, "test-copy-crash",
pool));
svn_client_create_context(&ctx, pool);
Modified: subversion/branches/uris-as-urls/subversion/tests/libsvn_ra_local/ra-local-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/tests/libsvn_ra_local/ra-local-test.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/tests/libsvn_ra_local/ra-local-test.c (original)
+++ subversion/branches/uris-as-urls/subversion/tests/libsvn_ra_local/ra-local-test.c Thu Jan 20 22:41:06 2011
@@ -57,7 +57,7 @@ make_and_open_local_repos(svn_ra_session
SVN_ERR(svn_test__create_repos(&repos, repos_name, opts, pool));
SVN_ERR(svn_ra_initialize(pool));
- SVN_ERR(svn_uri_get_file_url_from_dirent(&url, repos_name, pool));
+ SVN_ERR(svn_url_get_file_url_from_dirent(&url, repos_name, pool));
SVN_ERR(svn_ra_open3(session,
url,
@@ -218,7 +218,7 @@ check_split_url(const char *repos_path,
/* Create a filesystem and repository */
SVN_ERR(svn_test__create_repos(&repos, repos_path, opts, pool));
- SVN_ERR(svn_uri_get_file_url_from_dirent(&root_url, repos_path, pool));
+ SVN_ERR(svn_url_get_file_url_from_dirent(&root_url, repos_path, pool));
if (in_repos_path)
url = apr_pstrcat(pool, root_url, in_repos_path, (char *)NULL);
else
Modified: subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/entries-compat.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/entries-compat.c Thu Jan 20 22:41:06 2011
@@ -642,7 +642,7 @@ test_access_baton_like_locking(apr_pool_
SVN_ERR(svn_io_make_dir_recursively(subdir, pool));
SVN_ERR(svn_wc_ensure_adm3(subdir, repos_uuid,
- svn_uri_join(url, "sub-wc", pool),
+ svn_path_url_add_component2(url, "sub-wc", pool),
repos_root_url, 0, svn_depth_infinity,
pool));
Modified: subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/op-depth-test.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/op-depth-test.c Thu Jan 20 22:41:06 2011
@@ -692,7 +692,9 @@ repo_wc_copies(wc_baton_t *b)
apr_array_header_t *sources
= apr_array_make(b->pool, 0, sizeof(svn_client_copy_source_t *));
- source.path = svn_uri_join(b->repos_url, subtest->from_path, b->pool);
+ source.path = svn_path_url_add_component2(b->repos_url,
+ subtest->from_path,
+ b->pool);
APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = &source;
SVN_ERR(svn_client_copy6(sources,
wc_path(b, subtest->to_path),
Modified: subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/utils.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/branches/uris-as-urls/subversion/tests/libsvn_wc/utils.c Thu Jan 20 22:41:06 2011
@@ -52,7 +52,7 @@ svn_test__create_repos_and_wc(const char
svn_repos_t *repos;
SVN_ERR(svn_test__create_repos(&repos, repos_path, opts, pool));
- SVN_ERR(svn_uri_get_file_url_from_dirent(repos_url, repos_path, pool));
+ SVN_ERR(svn_url_get_file_url_from_dirent(repos_url, repos_path, pool));
}
/* Create a WC */
Modified: subversion/branches/uris-as-urls/tools/client-side/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/tools/client-side/svnmucc/svnmucc.c?rev=1061556&r1=1061555&r2=1061556&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/branches/uris-as-urls/tools/client-side/svnmucc/svnmucc.c Thu Jan 20 22:41:06 2011
@@ -365,7 +365,7 @@ subtract_anchor(const char *anchor, cons
if (! strcmp(url, anchor))
return "";
else
- return svn_path_uri_decode(svn_uri_is_child(anchor, url, pool), pool);
+ return svn_path_uri_decode(svn_url_is_child(anchor, url, pool), pool);
}
/* Add PATH to the operations tree rooted at OPERATION, creating any