[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-cvs
Subject: svn commit: r13802 - in trunk: . doc/misc-docs notes subversion/bindings/swig/java/org/tigris/subver
From: maxb () tigris ! org
Date: 2005-03-31 17:11:40
Message-ID: 200503311711.j2VHBeL05342 () morbius ! ch ! collab ! net
[Download RAW message or body]
Author: maxb
Date: Thu Mar 31 11:11:39 2005
New Revision: 13802
Modified:
trunk/CHANGES
trunk/doc/misc-docs/quick_walkthrough.xml
trunk/notes/webdav-general-summary
trunk/subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java
trunk/subversion/clients/cmdline/main.c
trunk/subversion/libsvn_client/diff.c
trunk/subversion/libsvn_fs_base/lock.c
trunk/subversion/libsvn_fs_fs/lock.c
trunk/subversion/libsvn_ra/ra_loader.c
trunk/subversion/libsvn_ra_dav/props.c
trunk/subversion/libsvn_ra_local/split_url.c
trunk/subversion/tests/clients/cmdline/basic_tests.py
trunk/subversion/tests/clients/cmdline/externals_tests.py
trunk/subversion/tests/clients/cmdline/getopt_tests.py
trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout
trunk/subversion/tests/clients/cmdline/svntest/main.py
trunk/tools/dev/stress.pl
trunk/win-tests.py
trunk/www/faq.html
Log:
URIs have schemes, not schemas. Fix everywhere.
* CHANGES
* doc/misc-docs/quick_walkthrough.xml
* notes/webdav-general-summary
* subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java
* subversion/clients/cmdline/main.c
* subversion/libsvn_client/diff.c
* subversion/libsvn_fs_base/lock.c
* subversion/libsvn_fs_fs/lock.c
* subversion/libsvn_ra/ra_loader.c
* subversion/libsvn_ra_dav/props.c
* subversion/libsvn_ra_local/split_url.c
* subversion/tests/clients/cmdline/basic_tests.py
* subversion/tests/clients/cmdline/externals_tests.py
* subversion/tests/clients/cmdline/getopt_tests.py
* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
* subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout
* subversion/tests/clients/cmdline/svntest/main.py
* tools/dev/stress.pl
* win-tests.py
* www/faq.html
Modified: trunk/CHANGES
Url: http://svn.collab.net/viewcvs/svn/trunk/CHANGES?view=diff&rev=13802&p1=trunk/CHANGES&r1=13801&p2=trunk/CHANGES&r2=13802
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Thu Mar 31 11:11:39 2005
@@ -837,7 +837,7 @@
* fixed 'mod_dav_svn' segfault bug caused by foreign DeltaV requests (r6725)
* fixed 'svn switch' bug which could result in corrupted repo (#1316,r6746)
* fixed items now marked as 'deleted' if they no longer exist (#919,r6748)
- * fixed 'merge' no longer adds file/dir if schema differs from wc. (#1321)
+ * fixed 'merge' no longer adds file/dir if scheme differs from wc. (#1321)
* fixed Handle \r correctly when prompting on Windows. (r6792,#1307)
* 'svn merge' now 'skip's when it hits unversioned obstructions (r6810,#1425)
* fixed repos->wc of file w/ svn:keywords set caused segfault (r6818,#1473)
Modified: trunk/doc/misc-docs/quick_walkthrough.xml
Url: http://svn.collab.net/viewcvs/svn/trunk/doc/misc-docs/quick_walkthrough.xml?view= \
diff&rev=13802&p1=trunk/doc/misc-docs/quick_walkthrough.xml&r1=13801&p2=trunk/doc/misc-docs/quick_walkthrough.xml&r2=13802
==============================================================================
--- trunk/doc/misc-docs/quick_walkthrough.xml (original)
+++ trunk/doc/misc-docs/quick_walkthrough.xml Thu Mar 31 11:11:39 2005
@@ -33,12 +33,12 @@
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- - handles 'http' schema
- - handles 'https' schema
+ - handles 'http' scheme
+ - handles 'https' scheme
* ra_local : Module for accessing a repository on local disk.
- - handles 'file' schema
+ - handles 'file' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- - handles 'svn' schema
+ - handles 'svn' scheme
</screen>
<para>If you don't see ra_local, it probably means that Berkeley
Modified: trunk/notes/webdav-general-summary
Url: http://svn.collab.net/viewcvs/svn/trunk/notes/webdav-general-summary?view=diff&re \
v=13802&p1=trunk/notes/webdav-general-summary&r1=13801&p2=trunk/notes/webdav-general-summary&r2=13802
==============================================================================
--- trunk/notes/webdav-general-summary (original)
+++ trunk/notes/webdav-general-summary Thu Mar 31 11:11:39 2005
@@ -93,7 +93,7 @@
- 'DAV:supportedlock' live property: indicates what kinds of
locking is allowed on a resource.
- - the rfc defines an 'opaquelocktoken' schema that all dav
+ - the rfc defines an 'opaquelocktoken' scheme that all dav
servers must know how to understand: clients may generate and
post them in an If: header.
Modified: trunk/subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/bindings/swig/java/org/tigris/ \
subversion/test/SVNTests.java?view=diff&rev=13802&p1=trunk/subversion/bindings/swig/ja \
va/org/tigris/subversion/test/SVNTests.java&r1=13801&p2=trunk/subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java&r2=13802
==============================================================================
--- trunk/subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java (original)
+++ trunk/subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java Thu \
Mar 31 11:11:39 2005 @@ -34,7 +34,7 @@
protected SVNAdmin admin;
protected SVNClient client;
*/
- protected String urlSchema = "file:///";
+ protected String urlScheme = "file:///";
protected File rootDir = new File(System.getProperty("user.dir"));
protected String testBaseName;
protected static int testCounter;
@@ -165,7 +165,7 @@
protected String makeReposURL(File file)
{
- return urlSchema + file.getAbsolutePath().replace(File.separatorChar,
+ return urlScheme + file.getAbsolutePath().replace(File.separatorChar,
'/');
}
Modified: trunk/subversion/clients/cmdline/main.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/clients/cmdline/main.c?view=di \
ff&rev=13802&p1=trunk/subversion/clients/cmdline/main.c&r1=13801&p2=trunk/subversion/clients/cmdline/main.c&r2=13802
==============================================================================
--- trunk/subversion/clients/cmdline/main.c (original)
+++ trunk/subversion/clients/cmdline/main.c Thu Mar 31 11:11:39 2005
@@ -688,7 +688,7 @@
" 2. Rewrite working copy URL metadata to reflect a syntactic change "
"only.\n"
" This is used when repository's root URL changes (such as a "
- "schema\n"
+ "scheme\n"
" or hostname change) but your working copy still reflects the "
"same\n"
" directory within the same repository.\n"),
Modified: trunk/subversion/libsvn_client/diff.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_client/diff.c?view=diff \
&rev=13802&p1=trunk/subversion/libsvn_client/diff.c&r1=13801&p2=trunk/subversion/libsvn_client/diff.c&r2=13802
==============================================================================
--- trunk/subversion/libsvn_client/diff.c (original)
+++ trunk/subversion/libsvn_client/diff.c Thu Mar 31 11:11:39 2005
@@ -173,13 +173,13 @@
}
-/* Return SVN_ERR_UNSUPPORTED_FEATURE if URL's schema does not
- match the schema of the url for ADM_ACCESS's path; return
- SVN_ERR_BAD_URL if no schema can be found for one or both urls;
+/* Return SVN_ERR_UNSUPPORTED_FEATURE if URL's scheme does not
+ match the scheme of the url for ADM_ACCESS's path; return
+ SVN_ERR_BAD_URL if no scheme can be found for one or both urls;
otherwise return SVN_NO_ERROR. Use @a ADM_ACCESS's pool for
temporary allocation. */
static svn_error_t *
-check_schema_match (svn_wc_adm_access_t *adm_access, const char *url)
+check_scheme_match (svn_wc_adm_access_t *adm_access, const char *url)
{
const char *path = svn_wc_adm_access_path (adm_access);
apr_pool_t *pool = svn_wc_adm_access_pool (adm_access);
@@ -195,26 +195,26 @@
{
return svn_error_createf
(SVN_ERR_BAD_URL, NULL,
- _("URLs have no schema ('%s' and '%s')"), url, ent->url);
+ _("URLs have no scheme ('%s' and '%s')"), url, ent->url);
}
else if (idx1 == NULL)
{
return svn_error_createf
(SVN_ERR_BAD_URL, NULL,
- _("URL has no schema: '%s'"), url);
+ _("URL has no scheme: '%s'"), url);
}
else if (idx2 == NULL)
{
return svn_error_createf
(SVN_ERR_BAD_URL, NULL,
- _("URL has no schema: '%s'"), ent->url);
+ _("URL has no scheme: '%s'"), ent->url);
}
else if (((idx1 - url) != (idx2 - ent->url))
|| (strncmp (url, ent->url, idx1 - url) != 0))
{
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Access schema mixtures not yet supported ('%s' and '%s')"),
+ _("Access scheme mixtures not yet supported ('%s' and '%s')"),
url, ent->url);
}
@@ -959,7 +959,7 @@
assert (child != NULL);
copyfrom_url = svn_path_url_add_component (merge_b->url, child,
merge_b->pool);
- SVN_ERR (check_schema_match (adm_access, copyfrom_url));
+ SVN_ERR (check_scheme_match (adm_access, copyfrom_url));
/* Since 'mine' doesn't exist, and this is
'merge_file_added', I hope it's safe to assume that
@@ -1131,7 +1131,7 @@
child = svn_path_is_child (merge_b->target, path, subpool);
assert (child != NULL);
copyfrom_url = svn_path_url_add_component (merge_b->url, child, subpool);
- SVN_ERR (check_schema_match (adm_access, copyfrom_url));
+ SVN_ERR (check_scheme_match (adm_access, copyfrom_url));
SVN_ERR (svn_io_check_path (path, &kind, subpool));
switch (kind)
Modified: trunk/subversion/libsvn_fs_base/lock.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/lock.c?view=dif \
f&rev=13802&p1=trunk/subversion/libsvn_fs_base/lock.c&r1=13801&p2=trunk/subversion/libsvn_fs_base/lock.c&r2=13802
==============================================================================
--- trunk/subversion/libsvn_fs_base/lock.c (original)
+++ trunk/subversion/libsvn_fs_base/lock.c Thu Mar 31 11:11:39 2005
@@ -242,7 +242,7 @@
apr_uuid_format (uuid_str, &uuid);
/* For now, we generate a URI that matches the DAV RFC. We could
- change this to some other URI schema someday, if we wish. */
+ change this to some other URI scheme someday, if we wish. */
*token = apr_pstrcat (pool, "opaquelocktoken:", uuid_str, NULL);
return SVN_NO_ERROR;
}
Modified: trunk/subversion/libsvn_fs_fs/lock.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_fs/lock.c?view=diff& \
rev=13802&p1=trunk/subversion/libsvn_fs_fs/lock.c&r1=13801&p2=trunk/subversion/libsvn_fs_fs/lock.c&r2=13802
==============================================================================
--- trunk/subversion/libsvn_fs_fs/lock.c (original)
+++ trunk/subversion/libsvn_fs_fs/lock.c Thu Mar 31 11:11:39 2005
@@ -814,7 +814,7 @@
apr_uuid_format (uuid_str, &uuid);
/* For now, we generate a URI that matches the DAV RFC. We could
- change this to some other URI schema someday, if we wish. */
+ change this to some other URI scheme someday, if we wish. */
*token = apr_pstrcat (pool, "opaquelocktoken:", uuid_str, NULL);
return SVN_NO_ERROR;
}
Modified: trunk/subversion/libsvn_ra/ra_loader.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_ra/ra_loader.c?view=dif \
f&rev=13802&p1=trunk/subversion/libsvn_ra/ra_loader.c&r1=13801&p2=trunk/subversion/libsvn_ra/ra_loader.c&r2=13802
==============================================================================
--- trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ trunk/subversion/libsvn_ra/ra_loader.c Thu Mar 31 11:11:39 2005
@@ -573,7 +573,7 @@
for (schemes = vtable->get_schemes(iterpool); *schemes != NULL;
++schemes)
{
- line = apr_psprintf (iterpool, _(" - handles '%s' schema\n"),
+ line = apr_psprintf (iterpool, _(" - handles '%s' scheme\n"),
*schemes);
svn_stringbuf_appendcstr (output, line);
}
Modified: trunk/subversion/libsvn_ra_dav/props.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_ra_dav/props.c?view=dif \
f&rev=13802&p1=trunk/subversion/libsvn_ra_dav/props.c&r1=13801&p2=trunk/subversion/libsvn_ra_dav/props.c&r2=13802
==============================================================================
--- trunk/subversion/libsvn_ra_dav/props.c (original)
+++ trunk/subversion/libsvn_ra_dav/props.c Thu Mar 31 11:11:39 2005
@@ -644,7 +644,7 @@
ne_uri parsed_url;
const char *lopped_path = "";
- /* Split the url into its component pieces (schema, host, path,
+ /* Split the url into its component pieces (scheme, host, path,
etc). We want the path part. */
ne_uri_parse (url, &parsed_url);
if (parsed_url.path == NULL)
Modified: trunk/subversion/libsvn_ra_local/split_url.c
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_ra_local/split_url.c?vi \
ew=diff&rev=13802&p1=trunk/subversion/libsvn_ra_local/split_url.c&r1=13801&p2=trunk/subversion/libsvn_ra_local/split_url.c&r2=13802
==============================================================================
--- trunk/subversion/libsvn_ra_local/split_url.c (original)
+++ trunk/subversion/libsvn_ra_local/split_url.c Thu Mar 31 11:11:39 2005
@@ -81,7 +81,7 @@
#else /* WIN32 */
/* On Windows, we'll typically have to skip the leading / if the
path starts with a drive letter. Like most Web browsers, We
- support two variants of this schema:
+ support two variants of this scheme:
file:///X:/path and
file:///X|/path
Modified: trunk/subversion/tests/clients/cmdline/basic_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/basic_te \
sts.py?view=diff&rev=13802&p1=trunk/subversion/tests/clients/cmdline/basic_tests.py&r1=13801&p2=trunk/subversion/tests/clients/cmdline/basic_tests.py&r2=13802
==============================================================================
--- trunk/subversion/tests/clients/cmdline/basic_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/basic_tests.py Thu Mar 31 11:11:39 2005
@@ -1578,8 +1578,8 @@
# Revision 6638 made 'svn co http://host' seg fault, this tests the fix.
svntest.main.safe_rmtree(wc_dir)
url = svntest.main.current_repo_url
- schema = url[:string.find(url, ":")]
- url = schema + "://some_nonexistent_host_with_no_trailing_slash"
+ scheme = url[:string.find(url, ":")]
+ url = scheme + "://some_nonexistent_host_with_no_trailing_slash"
svntest.actions.run_and_verify_svn("No error where one expected",
None, SVNAnyOutput,
'co', url, wc_dir)
Modified: trunk/subversion/tests/clients/cmdline/externals_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/external \
s_tests.py?view=diff&rev=13802&p1=trunk/subversion/tests/clients/cmdline/externals_tes \
ts.py&r1=13801&p2=trunk/subversion/tests/clients/cmdline/externals_tests.py&r2=13802 \
==============================================================================
--- trunk/subversion/tests/clients/cmdline/externals_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/externals_tests.py Thu Mar 31 11:11:39 \
2005 @@ -56,13 +56,13 @@
The arrangement of the externals in the first repository is:
- /A/C/ ==> exdir_G <schema>:///<other_repos>/A/D/G
- exdir_H -r 1 <schema>:///<other_repos>/A/D/H
+ /A/C/ ==> exdir_G <scheme>:///<other_repos>/A/D/G
+ exdir_H -r 1 <scheme>:///<other_repos>/A/D/H
- /A/D/ ==> exdir_A <schema>:///<other_repos>/A
- exdir_A/G <schema>:///<other_repos>/A/D/G
- exdir_A/H -r 3 <schema>:///<other_repos>/A/D/H
- x/y/z/blah <schema>:///<other_repos>/A/B
+ /A/D/ ==> exdir_A <scheme>:///<other_repos>/A
+ exdir_A/G <scheme>:///<other_repos>/A/D/G
+ exdir_A/H -r 3 <scheme>:///<other_repos>/A/D/H
+ x/y/z/blah <scheme>:///<other_repos>/A/B
NOTE: Before calling this, use externals_test_cleanup(SBOX) to
remove a previous incarnation of the other repository.
Modified: trunk/subversion/tests/clients/cmdline/getopt_tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/getopt_t \
ests.py?view=diff&rev=13802&p1=trunk/subversion/tests/clients/cmdline/getopt_tests.py&r1=13801&p2=trunk/subversion/tests/clients/cmdline/getopt_tests.py&r2=13802
==============================================================================
--- trunk/subversion/tests/clients/cmdline/getopt_tests.py (original)
+++ trunk/subversion/tests/clients/cmdline/getopt_tests.py Thu Mar 31 11:11:39 2005
@@ -57,7 +57,7 @@
# Also for 'svn --version':
re.compile(r"\* ra_(dav|local|svn) :"),
- re.compile(r" - handles '(https?|file|svn)' schema"),
+ re.compile(r" - handles '(https?|file|svn)' scheme"),
re.compile(r"\* fs_(base|fs) :"),
]
Modified: trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/getopt_t \
ests_data/svn--version_stdout?view=diff&rev=13802&p1=trunk/subversion/tests/clients/cm \
dline/getopt_tests_data/svn--version_stdout&r1=13801&p2=trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout&r2=13802
==============================================================================
--- trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout (original)
+++ trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout Thu \
Mar 31 11:11:39 2005 @@ -8,12 +8,12 @@
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- - handles 'http' schema
- - handles 'https' schema
+ - handles 'http' scheme
+ - handles 'https' scheme
* ra_local : Module for accessing a repository on local disk.
- - handles 'file' schema
+ - handles 'file' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- - handles 'svn' schema
+ - handles 'svn' scheme
The following repository back-end (FS) modules are available:
Modified: trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/getopt_t \
ests_data/svn_help_log_switch_stdout?view=diff&rev=13802&p1=trunk/subversion/tests/cli \
ents/cmdline/getopt_tests_data/svn_help_log_switch_stdout&r1=13801&p2=trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout&r2=13802
==============================================================================
--- trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout Thu \
Mar 31 11:11:39 2005 @@ -54,7 +54,7 @@
move a working copy to a branch or tag within the same repository.
2. Rewrite working copy URL metadata to reflect a syntactic change only.
- This is used when repository's root URL changes (such as a schema
+ This is used when repository's root URL changes (such as a scheme
or hostname change) but your working copy still reflects the same
directory within the same repository.
Modified: trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/getopt_t \
ests_data/svn_version_stdout?view=diff&rev=13802&p1=trunk/subversion/tests/clients/cmd \
line/getopt_tests_data/svn_version_stdout&r1=13801&p2=trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout&r2=13802
==============================================================================
--- trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout (original)
+++ trunk/subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout Thu \
Mar 31 11:11:39 2005 @@ -8,12 +8,12 @@
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- - handles 'http' schema
- - handles 'https' schema
+ - handles 'http' scheme
+ - handles 'https' scheme
* ra_local : Module for accessing a repository on local disk.
- - handles 'file' schema
+ - handles 'file' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- - handles 'svn' schema
+ - handles 'svn' scheme
The following repository back-end (FS) modules are available:
Modified: trunk/subversion/tests/clients/cmdline/svntest/main.py
Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/tests/clients/cmdline/svntest/ \
main.py?view=diff&rev=13802&p1=trunk/subversion/tests/clients/cmdline/svntest/main.py&r1=13801&p2=trunk/subversion/tests/clients/cmdline/svntest/main.py&r2=13802
==============================================================================
--- trunk/subversion/tests/clients/cmdline/svntest/main.py (original)
+++ trunk/subversion/tests/clients/cmdline/svntest/main.py Thu Mar 31 11:11:39 2005
@@ -80,11 +80,11 @@
# Windows specifics
if sys.platform == 'win32':
windows = 1
- file_schema_prefix = 'file:///'
+ file_scheme_prefix = 'file:///'
_exe = '.exe'
else:
windows = 0
- file_schema_prefix = 'file://'
+ file_scheme_prefix = 'file://'
_exe = ''
# The locations of the svn, svnadmin and svnlook binaries, relative to
@@ -109,7 +109,7 @@
cleanup_mode = 0
# Global URL to testing area. Default to ra_local, current working dir.
-test_area_url = file_schema_prefix + os.path.abspath(os.getcwd())
+test_area_url = file_scheme_prefix + os.path.abspath(os.getcwd())
if windows == 1:
test_area_url = string.replace(test_area_url, '\\', '/')
@@ -432,12 +432,12 @@
def canonize_url(input):
- "Canonize the url, if the schema is unknown, returns intact input"
+ "Canonize the url, if the scheme is unknown, returns intact input"
m = re.match(r"^((file://)|((svn|svn\+ssh|http|https)(://)))", input)
if m:
- schema = m.group(1)
- return schema + re.sub(r'//*', '/', input[len(schema):])
+ scheme = m.group(1)
+ return scheme + re.sub(r'//*', '/', input[len(scheme):])
else:
return input
Modified: trunk/tools/dev/stress.pl
Url: http://svn.collab.net/viewcvs/svn/trunk/tools/dev/stress.pl?view=diff&rev=13802&p1=trunk/tools/dev/stress.pl&r1=13801&p2=trunk/tools/dev/stress.pl&r2=13802
==============================================================================
--- trunk/tools/dev/stress.pl (original)
+++ trunk/tools/dev/stress.pl Thu Mar 31 11:11:39 2005
@@ -389,7 +389,7 @@
# [Windows compat]
# Replace backslashes in the path, and tweak the number of slashes
-# in the schema separator to make the URL always correct.
+# in the scheme separator to make the URL always correct.
my $urlsep = ($repo =~ m/^\// ? '//' : '///');
$repo =~ s/\\/\//g;
Modified: trunk/win-tests.py
Url: http://svn.collab.net/viewcvs/svn/trunk/win-tests.py?view=diff&rev=13802&p1=trunk/win-tests.py&r1=13801&p2=trunk/win-tests.py&r2=13802
==============================================================================
--- trunk/win-tests.py (original)
+++ trunk/win-tests.py Thu Mar 31 11:11:39 2005
@@ -63,7 +63,7 @@
log = 'svn-tests.log'
run_svnserve = 1
else:
- # Don't know this schema, but who're we to judge whether it's
+ # Don't know this scheme, but who're we to judge whether it's
# correct or not?
log = 'url-tests.log'
elif opt == '--svnserve-args':
Modified: trunk/www/faq.html
Url: http://svn.collab.net/viewcvs/svn/trunk/www/faq.html?view=diff&rev=13802&p1=trunk/www/faq.html&r1=13801&p2=trunk/www/faq.html&r2=13802
==============================================================================
--- trunk/www/faq.html (original)
+++ trunk/www/faq.html Thu Mar 31 11:11:39 2005
@@ -648,7 +648,7 @@
<p>Of course, your svn client will have to have been built with ssl
support; just pass <tt>--with-ssl</tt> to subversion's
<tt>./configure</tt> script. You can check to see whether the 'https'
-schema is supported by running <tt>svn --version</tt>.</p>
+scheme is supported by running <tt>svn --version</tt>.</p>
<![CDATA[=========================================================]]>
---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic