You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2014/03/03 17:39:01 UTC
svn commit: r1573603 [3/3] - in /subversion/branches/fsfs-lock-many: ./
build/ build/ac-macros/ contrib/cgi/ contrib/client-side/emacs/
contrib/client-side/svn2cl/ contrib/hook-scripts/
contrib/server-side/svnstsw/ notes/ notes/merge-tracking/ notes/wc...
Modified: subversion/branches/fsfs-lock-many/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/svnrdump/load_editor.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/svnrdump/load_editor.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/svnrdump/load_editor.c Mon Mar 3 16:38:58 2014
@@ -277,7 +277,7 @@ renumber_mergeinfo_revs(svn_string_t **f
inclusive there is one possible valid start revision that
won't be found in the PB->REV_MAP mapping of load stream
revsions to loaded revisions: The revision immediately
- preceeding the oldest revision from the load stream.
+ preceding the oldest revision from the load stream.
This is a valid revision for mergeinfo, but not a valid
copy from revision (which PB->REV_MAP also maps for) so it
will never be in the mapping.
Modified: subversion/branches/fsfs-lock-many/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/svnserve/svnserve.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/svnserve/svnserve.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/svnserve/svnserve.c Mon Mar 3 16:38:58 2014
@@ -148,7 +148,7 @@ enum run_mode {
/* Number of client to server connections that may concurrently in the
* TCP 3-way handshake state, i.e. are in the process of being created.
*
- * Larger values improve scalability with lots of small requests comming
+ * Larger values improve scalability with lots of small requests coming
* on over long latency networks.
*
* The OS may actually use a lower limit than specified here.
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/commit_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/commit_tests.py Mon Mar 3 16:38:58 2014
@@ -1439,7 +1439,7 @@ def commit_multiple_wc_nested(sbox):
svntest.actions.run_and_verify_status(wc2_dir, expected_status2)
# Commit should succeed, even though one target is a "child" of the other.
- svntest.actions.run_and_verify_svn("Ouput on stderr where none expected",
+ svntest.actions.run_and_verify_svn("Output on stderr where none expected",
svntest.verify.AnyOutput, [],
'commit', '-m', 'log',
wc_dir, wc2_dir)
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/diff_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/diff_tests.py Mon Mar 3 16:38:58 2014
@@ -3618,7 +3618,7 @@ def diff_correct_wc_base_revnum(sbox):
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
'--git', wc_dir)
- # The same again, but specifying the target explicity. This should
+ # The same again, but specifying the target explicitly. This should
# give the same output.
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
'--git', iota_path)
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_reintegrate_tests.py Mon Mar 3 16:38:58 2014
@@ -1332,7 +1332,7 @@ def reintegrate_with_subtree_mergeinfo(s
#
# D) Synch merge the changes in C) from 'trunk' to 'branch' and commit in
# rev N+3. The renamed subtree on 'branch' now has additional explicit
- # mergeinfo decribing the synch merge from trunk@N+1 to trunk@N+2.
+ # mergeinfo describing the synch merge from trunk@N+1 to trunk@N+2.
#
# E) Reintegrate 'branch' to 'trunk'.
#
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_tests.py Mon Mar 3 16:38:58 2014
@@ -3223,7 +3223,7 @@ def merge_file_replace_to_mixed_rev_wc(s
# Normally we'd simply update the whole working copy, but since that would
# defeat the purpose of this test (see the comment below), instead we'll
# update only "." using --depth empty. This preserves the intent of the
- # orginal mixed-rev test for this issue, but allows the merge tracking
+ # original mixed-rev test for this issue, but allows the merge tracking
# logic to consider r3 as valid for reverse merging.
svntest.actions.run_and_verify_svn(None, None, [],
'up', '--depth', 'empty', wc_dir)
@@ -9563,7 +9563,7 @@ def new_subtrees_should_not_break_merge(
wc_status.tweak(wc_rev=9)
# Yet another test for issue #3067. Merge -rX:Y, where X>Y (reverse merge)
- # and the merge target has a subtree that came into existance at some rev
+ # and the merge target has a subtree that came into existence at some rev
# N where X < N < Y. This merge should simply delete the subtree.
#
# For this test merge -r9:2 to A_COPY. This should revert all the merges
@@ -11818,7 +11818,7 @@ def subtree_source_missing_in_requested_
psi_COPY_path : '/A/D/H/psi:3,8' })
# Now test a reverse merge where part of the requested range postdates
- # a subtree's existance. Merge -r12:1 to A_COPY. This should revert
+ # a subtree's existence. Merge -r12:1 to A_COPY. This should revert
# all of the merges done thus far. The fact that A/D/H/psi no longer
# exists after r7 shouldn't break the subtree merge into A_COPY/D/H/psi.
# A_COPY/D/H/psi should simply have r3 reverse merged. No paths under
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/revert_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/revert_tests.py Mon Mar 3 16:38:58 2014
@@ -1640,7 +1640,7 @@ def revert_obstructing_wc(sbox):
wc_dir, '--set-depth', 'infinity')
# Revert should do nothing (no local changes), and report the obstruction
- # (reporting the obstruction is nice for debuging, but not really required
+ # (reporting the obstruction is nice for debugging, but not really required
# in this specific case, as the node was not modified)
svntest.actions.run_and_verify_svn(None, "Skipped '.*A' -- .*obstruct.*", [],
'revert', '-R', wc_dir)
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svnauthz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svnauthz_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svnauthz_tests.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svnauthz_tests.py Mon Mar 3 16:38:58 2014
@@ -101,11 +101,11 @@ def svnauthz_validate_file_test(sbox):
svntest.actions.run_and_verify_svnauthz("Invalid authz file", None, None,
1, False, "validate", authz_path)
- # Non-existant authz file
+ # Non-existent authz file
# exit code 2, operational error since we can't test the file.
os.close(authz_fd)
os.remove(authz_path)
- svntest.actions.run_and_verify_svnauthz("Non-existant authz file", None,
+ svntest.actions.run_and_verify_svnauthz("Non-existent authz file", None,
None, 2, False, "validate",
authz_path)
@@ -143,9 +143,9 @@ def svnauthz_validate_repo_test(sbox):
svntest.actions.run_and_verify_svnauthz("Invalid authz url", None, None,
1, False, "validate", iota_url)
- # Non-existant authz url
+ # Non-existent authz url
# exit code 2, operational error since we can't test the file.
- svntest.actions.run_and_verify_svnauthz("Non-existant authz file", None,
+ svntest.actions.run_and_verify_svnauthz("Non-existent authz file", None,
None, 2, False, "validate",
repo_url + "/zilch")
@@ -854,7 +854,7 @@ def svnauthz_accessof_txn_test(sbox):
expected_data = svntest.verify.ExpectedOutput('Exit 3\n', match_all=False)
verify_logfile(logfilepath, expected_data)
- # break the authz file with a non-existant group and check for an exit 1.
+ # break the authz file with a non-existent group and check for an exit 1.
expected_status.tweak('A/authz', status=' ', wc_rev=4)
svntest.main.file_append(authz_path, "@friends = rw\n")
if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -863,7 +863,7 @@ def svnauthz_accessof_txn_test(sbox):
expected_data = svntest.verify.ExpectedOutput('Exit 1\n', match_all=False)
verify_logfile(logfilepath, expected_data)
- # break the authz file with a non-existant gropu and check for an exit 2.
+ # break the authz file with a non-existent gropu and check for an exit 2.
expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Deleting')})
expected_status.remove('A/authz')
svntest.main.run_svn(None, 'rm', authz_path)
@@ -897,9 +897,9 @@ def svnauthz_compat_mode_file_test(sbox)
os.close(authz_fd)
os.remove(authz_path)
- # Check a non-existant file.
+ # Check a non-existent file.
svntest.actions.run_and_verify_svnauthz(
- "svnauthz-validate on non-existant file", None, None, 2, True,
+ "svnauthz-validate on non-existent file", None, None, 2, True,
authz_path
)
@@ -943,10 +943,10 @@ def svnauthz_compat_mode_repo_test(sbox)
None, None, 1, True,
authz_path)
- # Check a non-existant url.
+ # Check a non-existent url.
# Exit code really should be 2 since this is an operational error.
svntest.actions.run_and_verify_svnauthz(
- "svnauthz-validate on non-existant file", None, None, 2, True,
+ "svnauthz-validate on non-existent file", None, None, 2, True,
repo_url + "/zilch"
)
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/factory.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/factory.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/factory.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/factory.py Mon Mar 3 16:38:58 2014
@@ -308,7 +308,7 @@ class TestFactory:
# An optimized list kept up-to-date by variable additions
self.sorted_vars_by_pathlen = []
- # Wether we ever used the variables 'wc_dir' and 'url' (tiny tweak)
+ # Whether we ever used the variables 'wc_dir' and 'url' (tiny tweak)
self.used_wc_dir = False
self.used_abs_wc_dir = False
self.used_url = False
Modified: subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/main.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/main.py Mon Mar 3 16:38:58 2014
@@ -890,7 +890,7 @@ def create_repos(path, minor_version = N
exist, create it."""
if not os.path.exists(path):
- os.makedirs(path) # this creates all the intermediate dirs, if neccessary
+ os.makedirs(path) # this creates all the intermediate dirs, if necessary
opts = ("--bdb-txn-nosync",)
if minor_version is None or minor_version > options.server_minor_version:
Modified: subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/repos-test.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/repos-test.c Mon Mar 3 16:38:58 2014
@@ -1428,8 +1428,8 @@ in_repo_authz(const svn_test_opts_t *opt
* Create an authz file and put it in the repository.
* Verify it can be read with an relative URL.
* Verify it can be read with an absolute URL.
- * Verify non-existant path does not error out when must_exist is FALSE.
- * Verify non-existant path does error out when must_exist is TRUE.
+ * Verify non-existent path does not error out when must_exist is FALSE.
+ * Verify non-existent path does error out when must_exist is TRUE.
* Verify that an http:// URL produces an error.
* Verify that an svn:// URL produces an error.
*/
@@ -1466,11 +1466,11 @@ in_repo_authz(const svn_test_opts_t *opt
SVN_ERR(svn_repos_authz_read2(&authz_cfg, authz_url, NULL, TRUE, pool));
SVN_ERR(authz_check_access(authz_cfg, test_set, pool));
- /* Non-existant path in the repo with must_exist set to FALSE */
+ /* Non-existent path in the repo with must_exist set to FALSE */
SVN_ERR(svn_repos_authz_read2(&authz_cfg, noent_authz_url, NULL,
FALSE, pool));
- /* Non-existant path in the repo with must_exist set to TRUE */
+ /* Non-existent path in the repo with must_exist set to TRUE */
err = svn_repos_authz_read2(&authz_cfg, noent_authz_url, NULL, TRUE, pool);
if (!err || err->apr_err != SVN_ERR_ILLEGAL_TARGET)
return svn_error_createf(SVN_ERR_TEST_FAILED, err,
@@ -1658,7 +1658,7 @@ in_repo_groups_authz(const svn_test_opts
/* Helper for the groups_authz test. Set *AUTHZ_P to a representation of
- AUTHZ_CONTENTS in conjuction with GROUPS_CONTENTS, using POOL for
+ AUTHZ_CONTENTS in conjunction with GROUPS_CONTENTS, using POOL for
temporary allocation. If DISK is TRUE then write the contents to
temporary files and use svn_repos_authz_read2() to get the data if FALSE
write the data to a buffered stream and use svn_repos_authz_parse(). */
@@ -1773,7 +1773,7 @@ groups_authz(const svn_test_opts_t *opts
* 2. Verify that access rights written in the global groups file are
* discarded and affect nothing in authorization terms.
* 3. Verify that local groups in the authz file are prohibited in
- * conjuction with global groups (and that a configuration error is
+ * conjunction with global groups (and that a configuration error is
* reported in this scenario).
* 4. Ensure that group cycles in the global groups file are reported.
*
@@ -1829,7 +1829,7 @@ groups_authz(const svn_test_opts_t *opts
SVN_ERR(authz_check_access(authz_cfg, test_set2, pool));
- /* Local groups cannot be used in conjuction with global groups. */
+ /* Local groups cannot be used in conjunction with global groups. */
groups_contents =
"[groups]" NL
"slaves = maximus" NL
Modified: subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/string-test.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/string-test.c Mon Mar 3 16:38:58 2014
@@ -872,7 +872,7 @@ struct svn_test_descriptor_t test_funcs[
SVN_TEST_PASS2(test16,
"find_char_backward; len = 0 case"),
SVN_TEST_PASS2(test17,
- "find_char_backward; no occurence case"),
+ "find_char_backward; no occurrence case"),
SVN_TEST_PASS2(test18,
"check whitespace removal; common case"),
SVN_TEST_PASS2(test19,
Modified: subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/utf-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/utf-test.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/utf-test.c Mon Mar 3 16:38:58 2014
@@ -227,7 +227,7 @@ test_utf_cstring_to_utf8_ex2(apr_pool_t
const char *expected_result;
const char *from_page;
} tests[] = {
- {"ascii text\n", "ascii text\n", "unexistant-page"},
+ {"ascii text\n", "ascii text\n", "unexistent-page"},
{"Edelwei\xdf", "Edelwei\xc3\x9f", "ISO-8859-1"}
};
@@ -267,7 +267,7 @@ test_utf_cstring_from_utf8_ex2(apr_pool_
const char *expected_result;
const char *to_page;
} tests[] = {
- {"ascii text\n", "ascii text\n", "unexistant-page"},
+ {"ascii text\n", "ascii text\n", "unexistent-page"},
{"Edelwei\xc3\x9f", "Edelwei\xdf", "ISO-8859-1"}
};
Modified: subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/db-test.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/db-test.c Mon Mar 3 16:38:58 2014
@@ -1274,7 +1274,7 @@ test_global_relocate(apr_pool_t *pool)
SVN_TEST_STRING_ASSERT(repos_root_url, ROOT_ONE);
SVN_TEST_STRING_ASSERT(repos_uuid, UUID_ONE);
- /* Test relocating to a repos not existant in the db */
+ /* Test relocating to a repos not existent in the db */
SVN_ERR(svn_wc__db_global_relocate(db, local_abspath, ROOT_THREE, pool));
SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL,
&repos_relpath, &repos_root_url, &repos_uuid,
Modified: subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c Mon Mar 3 16:38:58 2014
@@ -734,7 +734,7 @@ main(int argc, const char *argv[])
break;
else if (apr_err && (apr_err != APR_BADCH))
{
- /* Ignore invalid option error to allow passing arbitary options */
+ /* Ignore invalid option error to allow passing arbitrary options */
fprintf(stderr, "apr_getopt_long failed : [%d] %s\n",
apr_err, apr_strerror(apr_err, errmsg, sizeof(errmsg)));
exit(1);
Modified: subversion/branches/fsfs-lock-many/tools/dev/trails.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/tools/dev/trails.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/tools/dev/trails.py (original)
+++ subversion/branches/fsfs-lock-many/tools/dev/trails.py Mon Mar 3 16:38:58 2014
@@ -35,7 +35,7 @@ import operator
_re_trail = re.compile('\((?P<txn_body>[a-z_]*), (?P<filename>[a-z_\-./]*), (?P<lineno>[0-9]*), (?P<txn>0|1)\): (?P<ops>.*)')
_re_table_op = re.compile('\(([a-z]*), ([a-z]*)\)')
-_seperator = '------------------------------------------------------------\n'
+_separator = '------------------------------------------------------------\n'
def parse_trails_log(infile):
trails = []
@@ -79,9 +79,9 @@ def output_summary(trails, outfile):
median_ops = ops[total_trails / 2]
average_ops = float(total_ops) / total_trails
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('Summary\n')
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('Total number of trails: %10i\n' % total_trails)
outfile.write('Total number of ops: %10i\n' % total_ops)
outfile.write('max ops/trail: %10i\n' % max_ops)
@@ -123,9 +123,9 @@ def output_trail_length_frequencies(trai
total_trails = len(ops)
frequencies = list_frequencies(ops)
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('Trail length frequencies\n')
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('ops/trail frequency percentage\n')
for (r, f) in frequencies:
p = float(f) * 100 / total_trails
@@ -164,9 +164,9 @@ def output_trail_frequencies(trails, out
frequencies = list_frequencies(ttrails)
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('Trail frequencies\n')
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('frequency percentage ops/trail trail\n')
for (((txn_body, file, line), trail), f) in frequencies:
p = float(f) * 100 / total_trails
@@ -183,9 +183,9 @@ def output_txn_body_frequencies(trails,
total_trails = len(trails)
frequencies = list_frequencies(bodies)
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('txn_body frequencies\n')
- outfile.write(_seperator)
+ outfile.write(_separator)
outfile.write('frequency percentage txn_body\n')
for ((txn_body, file, line), f) in frequencies:
p = float(f) * 100 / total_trails