"Canonize" is a malapropism; the correct term is "canonicalize".
Also, "canonized" should be canonical" (grepping the source tree shows
that is clearly preferred to "canonicalized").
[[[
"Canonize" and "canonized" are not the correct terms. Replace them
with "canonicalize" and "canonical", respectively.
* subversion/tests/cmdline/svntest/main.py
(canonize_url): Rename to 'canonicalize_url'.
* subversion/tests/cmdline/trans_tests.py
(keywords_from_birth): Replace "canonize" with "canonicalize" and
"canonized" with "canonical".
* subversion/libsvn_repos/dump.c
(write_revision_record): Replace "canonize" with "canonicalize".
]]]
Index: subversion/tests/cmdline/trans_tests.py
===================================================================
--- subversion/tests/cmdline/trans_tests.py (revision 18619)
+++ subversion/tests/cmdline/trans_tests.py (working copy)
@@ -194,11 +194,11 @@
sbox.build()
wc_dir = sbox.wc_dir
- canonized_repo_url = svntest.main.canonize_url(sbox.repo_url)
- if canonized_repo_url[-1:] != '/':
- url_expand_test_data = canonized_repo_url + '/fixed_length_keywords'
+ canonical_repo_url = svntest.main.canonicalize_url(sbox.repo_url)
+ if canonical_repo_url[-1:] != '/':
+ url_expand_test_data = canonical_repo_url + '/fixed_length_keywords'
else:
- url_expand_test_data = canonized_repo_url + 'fixed_length_keywords'
+ url_expand_test_data = canonical_repo_url + 'fixed_length_keywords'
setup_working_copy (wc_dir, len(url_expand_test_data))
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py (revision 18619)
+++ subversion/tests/cmdline/svntest/main.py (working copy)
@@ -494,8 +494,8 @@
current_repo_url = string.replace(current_repo_url, '\\', '/')
-def canonize_url(input):
- "Canonize the url, if the scheme is unknown, returns intact input"
+def canonicalize_url(input):
+ "Canonicalize the url, if the scheme is unknown, returns intact input"
m = re.match(r"^((file://)|((svn|svn\+ssh|http|https)(://)))", input)
if m:
Index: subversion/libsvn_repos/dump.c
===================================================================
--- subversion/libsvn_repos/dump.c (revision 18619)
+++ subversion/libsvn_repos/dump.c (working copy)
@@ -849,7 +849,7 @@
SVN_ERR(svn_fs_revision_proplist(&props, fs, rev, pool));
/* Run revision date properties through the time conversion to
- canonize them. */
+ canonicalize them. */
/* ### Remove this when it is no longer needed for sure. */
datevalue = apr_hash_get(props, SVN_PROP_REVISION_DATE,
APR_HASH_KEY_STRING);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 26 18:53:30 2006