You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ja...@apache.org on 2020/03/31 22:50:42 UTC
svn commit: r1875968 - in /subversion/trunk/subversion/tests: ./ cmdline/
libsvn_client/ libsvn_fs/ libsvn_fs_x/
Author: jamessan
Date: Tue Mar 31 22:50:41 2020
New Revision: 1875968
URL: http://svn.apache.org/viewvc?rev=1875968&view=rev
Log:
Fix various typos detected by codespell
* tests/cmdline/externals_tests.py, tests/cmdline/lock_tests.py,
tests/cmdline/log_tests.py, tests/cmdline/merge_authz_tests.py,
tests/cmdline/merge_tests.py, tests/cmdline/move_tests.py,
tests/cmdline/svnadmin_tests.py, tests/cmdline/switch_tests.py,
tests/libsvn_client/conflicts-test.c, tests/libsvn_client/mtcc-test.c,
tests/libsvn_fs/fs-test.c, tests/libsvn_fs_x/fs-x-pack-test.c,
tests/svn_test_main.c:
(): Spelling fixes
Modified:
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/subversion/tests/cmdline/log_tests.py
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/move_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c
subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/trunk/subversion/tests/svn_test_main.c
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Mar 31 22:50:41 2020
@@ -3911,7 +3911,7 @@ def copy_pin_externals_whitespace_dir(sb
branches_url = repo_url + '/branches'
trunk_wc = sbox.ospath('trunk')
- # Create a new revision to creat interesting pinning revisions
+ # Create a new revision to create interesting pinning revisions
sbox.simple_propset('A', 'B', 'trunk')
sbox.simple_commit('trunk')
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Tue Mar 31 22:50:41 2020
@@ -1001,7 +1001,7 @@ def lock_and_exebit1(sbox):
if (not gamma_stat & mode_r
or gamma_stat & mode_w
or not gamma_stat & mode_x):
- logger.warn("Commiting a file with 'svn:needs-lock, svn:executable'")
+ logger.warn("Committing a file with 'svn:needs-lock, svn:executable'")
logger.warn("after unlocking modified file's permissions")
raise svntest.Failure
@@ -1065,7 +1065,7 @@ def lock_and_exebit2(sbox):
if (not gamma_stat & mode_r
or gamma_stat & mode_w
or not gamma_stat & mode_x):
- logger.warn("Commiting a file with 'svn:needs-lock, svn:executable'")
+ logger.warn("Committing a file with 'svn:needs-lock, svn:executable'")
logger.warn("did not set the file to read-only, executable")
raise svntest.Failure
@@ -1454,7 +1454,7 @@ def lock_path_not_in_head(sbox):
svntest.actions.run_and_verify_svn(None, [], 'up', '-r1', wc_dir)
expected_lock_fail_err_re = "svn: warning: W160042: " \
"(Path .* doesn't exist in HEAD revision)"
- # Issue #3524 These lock attemtps were triggering an assert over ra_serf:
+ # Issue #3524 These lock attempts were triggering an assert over ra_serf:
#
# working_copies\lock_tests-37>svn lock A\D
# ..\..\..\subversion\libsvn_client\ra.c:275: (apr_err=235000)
@@ -1835,7 +1835,7 @@ def commit_stolen_lock(sbox):
# When removing directories, the locks of contained files were not
# correctly removed from the working copy database, thus they later
# magically reappeared when new files or directories with the same
-# pathes were added.
+# paths were added.
@Issue(4364)
def drop_locks_on_parent_deletion(sbox):
"drop locks when the parent is deleted"
@@ -1856,7 +1856,7 @@ def drop_locks_on_parent_deletion(sbox):
[],
expected_status)
- # now re-add entities to the deleted pathes.
+ # now re-add entities to the deleted paths.
sbox.simple_mkdir('A/B')
sbox.simple_add_text('new file replacing old file', 'A/B/lambda')
sbox.simple_add_text('file replacing former dir', 'A/B/F')
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Tue Mar 31 22:50:41 2020
@@ -2094,7 +2094,7 @@ def merge_sensitive_log_copied_path_inhe
svntest.main.run_svn(None, 'move', old_gamma_path, new_gamma_path)
sbox.simple_commit(message='Move file')
- # 'svn log -g --stop-on-copy ^/A/C/gamma' hould return *only* r5
+ # 'svn log -g --stop-on-copy ^/A/C/gamma' should return *only* r5
# Previously this test failed because the change in gamma's inherited
# mergeinfo between r4 and r5, due to the move, was understood as a merge:
#
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Tue Mar 31 22:50:41 2020
@@ -97,7 +97,7 @@ def mergeinfo_and_skipped_paths(sbox):
wc_disk, wc_status = set_up_branch(sbox, False, 3)
# Create a restrictive authz where part of the merge source and part
- # of the target are inaccesible.
+ # of the target are inaccessible.
write_restrictive_svnserve_conf(sbox.repo_dir)
write_authz_file(sbox, {"/" : svntest.main.wc_author +"=rw",
# Make a directory in the merge source inaccessible.
@@ -342,7 +342,7 @@ def mergeinfo_and_skipped_paths(sbox):
# this.
#
# Merge -c5 -c8 to the restricted WC's A_COPY_2/D/H. r5 gets merged first
- # but is a no-op, r8 get's merged next and is operative so the mergeinfo
+ # but is a no-op, r8 gets merged next and is operative so the mergeinfo
# should be updated on the merge target to reflect both merges.
expected_output = wc.State(A_COPY_2_H_path, {
'omega' : Item(status='U '),
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Mar 31 22:50:41 2020
@@ -4794,7 +4794,7 @@ def mergeinfo_inheritance_and_discontinu
# Merge r2:6 into A_COPY/D
#
# A_COPY/D should inherit the mergeinfo '/A:4' from A_COPY
- # combine it with the discontinous merges performed directly on
+ # combine it with the discontinuous merges performed directly on
# it (A/D/ 2:3 and A/D 4:6) resulting in '/A/D:3-6'.
expected_output = wc.State(D_COPY_path, {
'H/psi' : Item(status='U '),
@@ -13361,7 +13361,7 @@ def no_self_referential_filtering_on_add
def merge_range_prior_to_rename_source_existence(sbox):
"merge prior to rename src existence still dels src"
- # Replicate a merge bug found while synching up a feature branch on the
+ # Replicate a merge bug found while syncing up a feature branch on the
# Subversion repository with trunk. See r874121 of
# http://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo, in which
# a move was merged to the target, but the delete half of the move
Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Tue Mar 31 22:50:41 2020
@@ -125,7 +125,7 @@ def move_file_test(sbox, source, dest, m
start_disk: validate the on disk state after the start update against this.
start_status: validate the wc status after the start update against this.
end_rev: revision to update to, bringing in some update you want to test.
- up_output: validate the output of the end update agianst this.
+ up_output: validate the output of the end update against this.
up_disk: validate the on disk state after the end update against this.
up_status: validate the wc status after the end update against this.
revert_paths: validate the paths reverted.
@@ -793,7 +793,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming identical move (r16-17)
# XXX: It'd be really nice if we actually recognized this and the wc
- # showed no conflict at all on udpate.
+ # showed no conflict at all on update.
test = {}
test['start_rev'] = 16
test['end_rev'] = 17
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Tue Mar 31 22:50:41 2020
@@ -1726,7 +1726,7 @@ def verify_non_utf8_paths(sbox):
# also fix up the 'created path' field
fp_new.write(b"cpath: /\xE6\n")
elif line == b"_0.0.t0-0 add-file true true /A\n":
- # and another occurrance
+ # and another occurrence
fp_new.write(b"_0.0.t0-0 add-file true true /\xE6\n")
else:
fp_new.write(line)
@@ -3177,7 +3177,7 @@ def load_txdelta(sbox):
sbox.build(empty=True)
- # This dumpfile produced a BDB repository that generated cheksum
+ # This dumpfile produced a BDB repository that generated checksum
# mismatches on read caused by the improper handling of
# svn_txdelta_target ops. The bug was fixed by r1640832.
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Tue Mar 31 22:50:41 2020
@@ -2870,7 +2870,7 @@ def switch_moves(sbox):
# In Subversion 1.8 this scenario causes an Sqlite row not found error.
# It would be nice if we could handle the tree conflict more intelligent, as
- # the working copy matches the incomming change.
+ # the working copy matches the incoming change.
svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath(''), branch_url,
None, expected_disk, expected_status)
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Tue Mar 31 22:50:41 2020
@@ -1362,7 +1362,7 @@ create_wc_with_incoming_delete_file_merg
}
else
{
- /* Commit modifcation and run a merge from the trunk to the branch. */
+ /* Commit modification and run a merge from the trunk to the branch. */
SVN_ERR(sbox_wc_commit(b, ""));
SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM));
/* This should raise an "incoming delete vs local edit" tree conflict. */
@@ -5126,7 +5126,7 @@ test_merge_incoming_move_dir_across_bran
apr_array_header_t *possible_moved_to_abspaths;
SVN_ERR(svn_test__sandbox_create(b,
- "merge_incoming_move_dir accross branches",
+ "merge_incoming_move_dir across branches",
opts, pool));
SVN_ERR(create_wc_with_incoming_delete_dir_conflict_across_branches(b));
@@ -6970,7 +6970,7 @@ create_dir_move_vs_dir_move_merge_confli
modified_file_content));
SVN_ERR(sbox_wc_commit(b, ""));
- /* Move the same direcotry to a different location on the branch. */
+ /* Move the same directory to a different location on the branch. */
SVN_ERR(sbox_wc_move(b, "A2/B", "A2/B-also-moved"));
SVN_ERR(sbox_wc_commit(b, ""));
Modified: subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c Tue Mar 31 22:50:41 2020
@@ -693,7 +693,7 @@ test_file_revs_both_ways(const svn_test_
subpool));
SVN_TEST_ASSERT(hrb.last == 6);
- /* Ressurect mu */
+ /* Resurrect mu */
svn_pool_clear(subpool);
SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 7, ctx, subpool, subpool));
SVN_ERR(svn_client__mtcc_add_copy("mu", 6, "mu", mtcc, subpool));
Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Tue Mar 31 22:50:41 2020
@@ -5479,7 +5479,7 @@ commit_timestamp(const svn_test_opts_t *
APR_HASH_KEY_STRING);
SVN_TEST_ASSERT(!svn_date);
- /* Commit that overwites a missing svn:date. */
+ /* Commit that overwrites a missing svn:date. */
SVN_ERR(svn_fs_begin_txn(&txn, fs, rev, pool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
SVN_ERR(svn_fs_make_dir(txn_root, "/zig", pool));
Modified: subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Tue Mar 31 22:50:41 2020
@@ -680,7 +680,7 @@ recover_fully_packed(const svn_test_opts
/* ------------------------------------------------------------------------ */
/* Regression test for issue #4320 (fsfs file-hinting fails when reading a rep
- from the transaction that is commiting rev = SHARD_SIZE). */
+ from the transaction that is committing rev = SHARD_SIZE). */
#define REPO_NAME "test-repo-file-hint-at-shard-boundary"
#define SHARD_SIZE 4
#define MAX_REV (SHARD_SIZE - 1)
Modified: subversion/trunk/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_main.c?rev=1875968&r1=1875967&r2=1875968&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_main.c (original)
+++ subversion/trunk/subversion/tests/svn_test_main.c Tue Mar 31 22:50:41 2020
@@ -880,7 +880,7 @@ svn_test_main(int argc, const char *argv
_set_error_mode(_OUT_TO_STDERR);
/* In _DEBUG mode: Redirect all debug output (E.g. assert() to stderr.
- (Ignored in releas builds) */
+ (Ignored in release builds) */
_CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR);
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);