Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Dec 30 20:46:50 2010 @@ -636,7 +636,7 @@ def run_entriesdump_subdirs(path): return [line.strip() for line in stdout_lines if not line.startswith("DBG:")] def run_atomic_ra_revprop_change(url, revision, propname, skel, want_error): - """Run the atomic-ra-revprop-change helper, returning its exit code, stdout, + """Run the atomic-ra-revprop-change helper, returning its exit code, stdout, and stderr. For HTTP, default HTTP library is used.""" # use spawn_process rather than run_command to avoid copying all the data # to stdout in verbose mode. @@ -644,7 +644,7 @@ def run_atomic_ra_revprop_change(url, re # 0, 0, None, path) # This passes HTTP_LIBRARY in addition to our params. - return run_command(atomic_ra_revprop_change_binary, True, False, + return run_command(atomic_ra_revprop_change_binary, True, False, url, revision, propname, skel, options.http_library, want_error and 1 or 0)
Modified: subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py Thu Dec 30 20:46:50 2010 @@ -186,7 +186,7 @@ class Sandbox: return '%s/REDIRECT-%s-%s' % (parts[0], temporary and 'TEMP' or 'PERM', parts[1]) - + def simple_update(self, target=None): """Update the WC or TARGET. TARGET is a relpath relative to the WC.""" Modified: subversion/trunk/subversion/tests/cmdline/svnversion_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnversion_tests.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnversion_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnversion_tests.py Thu Dec 30 20:46:50 2010 @@ -253,7 +253,7 @@ def svnversion_with_structural_changes(s iota_copy_path, repo_url + '/iota_copy', [ "Uncommitted local addition, " - "copy or move\n" ], + "copy or move\n" ], []) C_path = os.path.join(wc_dir, 'A', 'C') C_copy_path = os.path.join(wc_dir, 'C_copy') @@ -264,7 +264,7 @@ def svnversion_with_structural_changes(s C_copy_path, repo_url + '/C_copy', [ "Uncommitted local addition, " - "copy or move\n" ], + "copy or move\n" ], []) ######################################################################## Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Thu Dec 30 20:46:50 2010 @@ -877,7 +877,7 @@ def bad_intermediate_urls(sbox): actions.run_and_verify_switch(wc_dir, wc_dir, url_A_C, expected_output, expected_disk, expected_status, None, None, None, None, None, False) - + # However, the URL for wc/A should now reflect ^/A/C/A, not something else. expected_infos = [ { 'URL' : '.*/A/C/A$' }, @@ -1066,9 +1066,9 @@ def relocate_beyond_repos_root(sbox): svntest.main.safe_rmtree(wc_dir, 1) svntest.actions.run_and_verify_svn(None, None, [], 'checkout', repo_url + '/A', wc_dir) - + svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0) - + # A relocate that changes the repo path part of the URL shouldn't work. # This tests for issue #2380. svntest.actions.run_and_verify_svn(None, None, @@ -1358,40 +1358,40 @@ def forced_switch_failures(sbox): # """ # # Add a directory to obstruct a file. # mkdir A/B/F/pi - # + # # # Add a file to obstruct a directory. # echo "The file 'H'" > A/C/H - # + # # # Test three cases where forced switch should cause a tree conflict - # + # # # 1) A forced switch that tries to add a file when an unversioned # # directory of the same name already exists. (Currently fails) # svn switch --force url/A/D A/C - # + # # # 2) A forced switch that tries to add a dir when a file of the same # # name already exists. (Tree conflict) # svn switch --force url/A/D/G A/B/F # svn info A/B/F/pi - # + # # # 3) A forced update that tries to add a directory when a versioned # # directory of the same name already exists. - # + # # # Make dir A/D/H/I in repos. # svn mkdir -m "Log message" url/A/D/H/I - # + # # # Make A/D/G/I and co A/D/H/I into it. # mkdir A/D/G/I # svn co url/A/D/H/I A/D/G/I - # + # # # Try the forced switch. A/D/G/I obstructs the dir A/D/G/I coming # # from the repos, causing an error. # svn switch --force url/A/D/H A/D/G - # + # # # Delete all three obstructions and finish the update. # rm -rf A/D/G/I # rm A/B/F/pi # rm A/C/H - # + # # # A/B/F is switched to A/D/G # # A/C is switched to A/D # # A/D/G is switched to A/D/H @@ -1518,9 +1518,9 @@ def forced_switch_failures(sbox): 'A/D/G/I' : Item(), }) - exit_code, so, se = svntest.actions.run_and_verify_svn( - "Unexpected error during co", - ['Checked out revision 2.\n'], [], + exit_code, so, se = svntest.actions.run_and_verify_svn( + "Unexpected error during co", + ['Checked out revision 2.\n'], [], "co", url_A_D_H_I, A_D_G_I) # Try the forced switch. A/D/G/I obstructs the dir A/D/G/I coming @@ -3100,7 +3100,7 @@ def copy_with_switched_subdir(sbox): ### regression test for issue #3597 def relocate_with_relative_externals(sbox): "relocate a directory containing relative externals" - + sbox.build() wc_dir = sbox.wc_dir @@ -3108,7 +3108,7 @@ def relocate_with_relative_externals(sbo change_external(os.path.join(wc_dir, 'A', 'B'), "^/A/D/G G-ext\n../D/H H-ext", commit=True) svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir) - + # Move our repository to another location. repo_dir = sbox.repo_dir repo_url = sbox.repo_url Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Thu Dec 30 20:46:50 2010 @@ -1049,7 +1049,7 @@ def lock_update_only(sbox): # In our other working copy, steal that lock. svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock', '-m', '', '--force', file_path) - + # Now update the first working copy. It should appear as a no-op. expected_disk = main.greek_state.copy() expected_disk.remove('iota') Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Dec 30 20:46:50 2010 @@ -5321,7 +5321,7 @@ def update_with_file_lock_and_keywords_p # Make sure we are at a different timestamp to really notice a mtime change time.sleep(1) - # Issue #3471 manifests itself here; The timestamp of 'mu' gets updated + # Issue #3471 manifests itself here; The timestamp of 'mu' gets updated # to the time of the last "svn up". sbox.simple_update() mu_ts_after_update = os.path.getmtime(mu_path) Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Dec 30 20:46:50 2010 @@ -607,7 +607,7 @@ def missing_dirs(sbox): if svntest.main.wc_is_singledb(sbox.wc_dir): expected_status.tweak('A/D', 'A/B_new/F', status='! ') run_and_verify_status_no_server(sbox.wc_dir, expected_status) - + def missing_dirs2(sbox): "missing directories and obstructing dirs" @@ -670,7 +670,7 @@ def delete_and_keep_local(sbox): def dirs_only_upgrade(sbox): - "upgrade a wc without files" + "upgrade a wc without files" sbox.build(create_wc = False) replace_sbox_with_tarfile(sbox, 'dirs-only.tar.bz2') @@ -695,14 +695,14 @@ def read_tree_conflict_data(sbox, path): "and local_relpath = '%s'" % path): return raise svntest.Failure("conflict expected for '%s'" % path) - + def no_actual_node(sbox, path): dot_svn = svntest.main.get_admin_name() db = svntest.sqlite3.connect(os.path.join(sbox.wc_dir, dot_svn, 'wc.db')) for row in db.execute("select 1 from actual_node " "where local_relpath = '%s'" % path): raise svntest.Failure("no actual node expected for '%s'" % path) - + def upgrade_tree_conflict_data(sbox): "upgrade tree conflict data (f20->f21)" Modified: subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c Thu Dec 30 20:46:50 2010 @@ -285,7 +285,7 @@ check_content(svn_diff_hunk_t *hunk, svn svn_boolean_t exp_eof; svn_boolean_t hunk_eof; - exp = svn_stream_from_string(svn_string_create(expected, pool), + exp = svn_stream_from_string(svn_string_create(expected, pool), pool); while (TRUE) @@ -297,7 +297,7 @@ check_content(svn_diff_hunk_t *hunk, svn else SVN_ERR(svn_diff_hunk_readline_modified_text(hunk, &hunk_buf, NULL, &hunk_eof, pool, pool)); - + SVN_TEST_ASSERT(exp_eof == hunk_eof); if (exp_eof) break; @@ -339,7 +339,7 @@ test_parse_unidiff(apr_pool_t *pool) /* We have two patches with one hunk each. * Parse the first patch. */ SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, reverse, - ignore_whitespace, iterpool, + ignore_whitespace, iterpool, iterpool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "A/C/gamma"); @@ -357,7 +357,7 @@ test_parse_unidiff(apr_pool_t *pool) pool)); /* Parse the second patch. */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, reverse, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, reverse, ignore_whitespace, pool, pool)); SVN_TEST_ASSERT(patch); if (reverse) @@ -401,9 +401,9 @@ test_parse_git_diff(apr_pool_t *pool) SVN_ERR(create_patch_file(&patch_file, fname, git_unidiff, pool)); /* Parse a deleted empty file */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "A/mu"); @@ -412,16 +412,16 @@ test_parse_git_diff(apr_pool_t *pool) SVN_TEST_ASSERT(patch->hunks->nelts == 0); /* Parse a modified file. */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "A/C/gamma"); SVN_TEST_STRING_ASSERT(patch->new_filename, "A/C/gamma"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_modified); SVN_TEST_ASSERT(patch->hunks->nelts == 1); - + hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *); SVN_ERR(check_content(hunk, TRUE, @@ -434,9 +434,9 @@ test_parse_git_diff(apr_pool_t *pool) pool)); /* Parse a copied empty file */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); @@ -446,9 +446,9 @@ test_parse_git_diff(apr_pool_t *pool) SVN_TEST_ASSERT(patch->hunks->nelts == 0); /* Parse an added empty file */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); @@ -474,16 +474,16 @@ test_parse_git_tree_and_text_diff(apr_po pool)); /* Parse a copied file with text modifications. */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "iota"); SVN_TEST_STRING_ASSERT(patch->new_filename, "iota.copied"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_copied); SVN_TEST_ASSERT(patch->hunks->nelts == 1); - + hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *); SVN_ERR(check_content(hunk, TRUE, @@ -496,16 +496,16 @@ test_parse_git_tree_and_text_diff(apr_po pool)); /* Parse a moved file with text modifications. */ - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "A/mu"); SVN_TEST_STRING_ASSERT(patch->new_filename, "A/mu.moved"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_moved); SVN_TEST_ASSERT(patch->hunks->nelts == 1); - + hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *); SVN_ERR(check_content(hunk, TRUE, @@ -517,16 +517,16 @@ test_parse_git_tree_and_text_diff(apr_po "some more bytes to 'mu'" NL, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "/dev/null"); SVN_TEST_STRING_ASSERT(patch->new_filename, "new"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_added); SVN_TEST_ASSERT(patch->hunks->nelts == 1); - + hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *); SVN_ERR(check_content(hunk, TRUE, @@ -537,16 +537,16 @@ test_parse_git_tree_and_text_diff(apr_po "This is the file 'new'." NL, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "A/B/lambda"); SVN_TEST_STRING_ASSERT(patch->new_filename, "/dev/null"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_deleted); SVN_TEST_ASSERT(patch->hunks->nelts == 1); - + hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *); SVN_ERR(check_content(hunk, TRUE, @@ -571,16 +571,16 @@ test_bad_git_diff_headers(apr_pool_t *po SVN_ERR(create_patch_file(&patch_file, fname, bad_git_diff_header, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "iota"); SVN_TEST_STRING_ASSERT(patch->new_filename, "iota.copied"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_copied); SVN_TEST_ASSERT(patch->hunks->nelts == 1); - + hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *); SVN_ERR(check_content(hunk, TRUE, @@ -609,9 +609,9 @@ test_parse_property_diff(apr_pool_t *poo SVN_ERR(create_patch_file(&patch_file, fname, property_unidiff, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "iota"); @@ -712,9 +712,9 @@ test_parse_property_and_text_diff(apr_po SVN_ERR(create_patch_file(&patch_file, fname, property_and_text_unidiff, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "iota"); @@ -767,9 +767,9 @@ test_parse_diff_symbols_in_prop_unidiff( SVN_ERR(create_patch_file(&patch_file, fname, diff_symbols_in_prop_unidiff, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "iota"); @@ -865,19 +865,19 @@ test_git_diffs_with_spaces_diff(apr_pool SVN_ERR(create_patch_file(&patch_file, fname, path_with_spaces_unidiff, pool)); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "path 1"); SVN_TEST_STRING_ASSERT(patch->new_filename, "path 1"); SVN_TEST_ASSERT(patch->operation == svn_diff_op_added); SVN_TEST_ASSERT(patch->hunks->nelts == 0); - - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "path one 1"); @@ -885,9 +885,9 @@ test_git_diffs_with_spaces_diff(apr_pool SVN_TEST_ASSERT(patch->operation == svn_diff_op_added); SVN_TEST_ASSERT(patch->hunks->nelts == 0); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, "dir/ b/path"); @@ -895,9 +895,9 @@ test_git_diffs_with_spaces_diff(apr_pool SVN_TEST_ASSERT(patch->operation == svn_diff_op_added); SVN_TEST_ASSERT(patch->hunks->nelts == 0); - SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, + SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, FALSE, /* reverse */ - FALSE, /* ignore_whitespace */ + FALSE, /* ignore_whitespace */ pool, pool)); SVN_TEST_ASSERT(patch); SVN_TEST_STRING_ASSERT(patch->old_filename, " b/path 1"); Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Dec 30 20:46:50 2010 @@ -2364,7 +2364,7 @@ test_dirent_get_absolute_from_lc_drive(a } if (!some_dir_on_C) - return svn_error_create(SVN_ERR_BASE, NULL, + return svn_error_create(SVN_ERR_BASE, NULL, "No usable test directory found in C:\\"); /* Use the test path, but now with a lower case driveletter */ @@ -2705,7 +2705,7 @@ test_dirent_from_file_url(apr_pool_t *po for (i = 0; i < COUNT_OF(tests); i++) { const char *result; - + SVN_ERR(svn_uri_get_dirent_from_file_url(&result, tests[i].url, pool)); if (strcmp(result, tests[i].result)) @@ -2777,7 +2777,7 @@ test_file_url_from_dirent(apr_pool_t *po for (i = 0; i < COUNT_OF(tests); i++) { const char *result; - + SVN_ERR(svn_uri_get_file_url_from_dirent(&result, tests[i].dirent, pool)); @@ -2828,7 +2828,7 @@ test_dirent_is_under_root(apr_pool_t *po { svn_boolean_t under_root; const char *result; - + SVN_ERR(svn_dirent_is_under_root(&under_root, &result, tests[i].base_path, Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Thu Dec 30 20:46:50 2010 @@ -1579,7 +1579,7 @@ remove_prefix_helper(struct catalog_bits svn_mergeinfo_catalog_t in_catalog, out_catalog, exp_out_catalog; apr_hash_index_t *hi; int i = 0; - + in_catalog = apr_hash_make(pool); exp_out_catalog = apr_hash_make(pool); while (test_data[i].orig_path) Modified: subversion/trunk/subversion/tests/libsvn_subr/stream-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/stream-test.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/stream-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/stream-test.c Thu Dec 30 20:46:50 2010 @@ -429,7 +429,7 @@ test_stream_seek_translated(apr_pool_t * svn_stream_mark_t *mark, *mark2; apr_hash_t *keywords; svn_string_t *keyword_val; - + keywords = apr_hash_make(pool); keyword_val = svn_string_create("my key word was expanded", pool); apr_hash_set(keywords, "MyKeyword", APR_HASH_KEY_STRING, keyword_val); Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Thu Dec 30 20:46:50 2010 @@ -376,7 +376,7 @@ create_open(svn_wc__db_t **db, TRUE /* auto_upgrade */, TRUE /* enforce_empty_wq */, pool, pool)); - + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py (original) +++ subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py Thu Dec 30 20:46:50 2010 @@ -217,14 +217,14 @@ def prepare(ctx, action, kind): prepare_cp(ctx, kind, '1') elif action == cp2: prepare_cp(ctx, kind, '2') - + def postpare(ctx, action, kind): if action == cp1: postpare_cp(ctx, kind, '1') elif action == cp2: postpare_cp(ctx, kind, '2') - + def co(name, local_action, local_kind, incoming_action, incoming_kind): @@ -249,7 +249,7 @@ def co(name, local_action, local_kind, i postpare(ctx, local_action, local_kind) postpare(ctx, incoming_action, incoming_kind) - + # get conflicts o1,e1 = shell('yes p | svn checkout "' + ctx.URL + '" ' + '"' + ctx.WC + '"') @@ -260,7 +260,7 @@ def co(name, local_action, local_kind, i +'select local_relpath,properties from actual_node; ' ]) return o1, e1, o2, e2, o3, e3 - + def up(name, local_action, local_kind, incoming_action, incoming_kind): ctx = TestContext() @@ -285,7 +285,7 @@ def up(name, local_action, local_kind, i postpare(ctx, local_action, local_kind) postpare(ctx, incoming_action, incoming_kind) - + # get conflicts o1,e1 = svn('update', '--accept=postpone', ctx.WC) o2,e2 = svn('status', ctx.WC) @@ -295,7 +295,7 @@ def up(name, local_action, local_kind, i +'select local_relpath,properties from actual_node; ' ]) return o1, e1, o2, e2, o3, e3 - + def sw(name, local_action, local_kind, incoming_action, incoming_kind): ctx = TestContext() @@ -318,7 +318,7 @@ def sw(name, local_action, local_kind, i postpare(ctx, local_action, local_kind) postpare(ctx, incoming_action, incoming_kind) - + # get conflicts o1,e1 = svn('switch', '--accept=postpone', ctx.url('branch'), ctx.wc('trunk')) o2,e2 = svn('status', ctx.WC) @@ -330,7 +330,7 @@ def sw(name, local_action, local_kind, i # This controls which tests are run. All possible combinations are tested. -# The elements are functions for up,sw and add,cp1,cp2,unver, and they are +# The elements are functions for up,sw and add,cp1,cp2,unver, and they are # simple strings for f (file), l (symlink), d (directory). # # cmd local action and kind incoming action and kind Modified: subversion/trunk/tools/client-side/svn-viewspec.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-viewspec.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svn-viewspec.py (original) +++ subversion/trunk/tools/client-side/svn-viewspec.py Thu Dec 30 20:46:50 2010 @@ -35,7 +35,7 @@ by this script as it checks out the spec 2. Parse VIEWSPEC-FILE and dump out a human-readable representation of the tree described in the specification. - + 3. Show this usage message. 4. Show information about the file format this program expects. @@ -307,7 +307,7 @@ def usage_and_exit(errmsg=None): if errmsg: stream.write("ERROR: %s\n" % (errmsg)) sys.exit(errmsg and 1 or 0) - + def main(): argc = len(sys.argv) if argc < 2: @@ -341,6 +341,6 @@ def main(): checkout_spec(parse_viewspec(fp), sys.argv[3]) else: usage_and_exit('Unknown subcommand "%s".' % (subcommand)) - + if __name__ == "__main__": main() Modified: subversion/trunk/tools/client-side/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnmucc/svnmucc.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svnmucc/svnmucc.c (original) +++ subversion/trunk/tools/client-side/svnmucc/svnmucc.c Thu Dec 30 20:46:50 2010 @@ -162,7 +162,7 @@ struct operation { const char *url; /* to copy, valid for add and replace */ const char *src_file; /* for put, the source file for contents */ apr_hash_t *children; /* const char *path -> struct operation * */ - apr_hash_t *prop_mods; /* const char *prop_name -> + apr_hash_t *prop_mods; /* const char *prop_name -> const svn_string_t *prop_value */ apr_array_header_t *prop_dels; /* const char *prop_name deletions */ void *baton; /* as returned by the commit editor */ @@ -204,7 +204,7 @@ change_props(const svn_delta_editor_t *e { const void *key; void *val; - + svn_pool_clear(iterpool); apr_hash_this(hi, &key, NULL, &val); if (child->kind == svn_node_dir) @@ -1009,15 +1009,15 @@ main(int argc, const char **argv) else if (action->action == ACTION_PROPSET) { action->prop_value = - svn_string_create(APR_ARRAY_IDX(action_args, i, + svn_string_create(APR_ARRAY_IDX(action_args, i, const char *), pool); if (++i == action_args->nelts) insufficient(pool); } else { - const char *propval_file = - svn_path_canonicalize(APR_ARRAY_IDX(action_args, i, + const char *propval_file = + svn_path_canonicalize(APR_ARRAY_IDX(action_args, i, const char *), pool); if (++i == action_args->nelts) Modified: subversion/trunk/tools/dev/wc-ng/bump-to-19.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-ng/bump-to-19.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/dev/wc-ng/bump-to-19.py (original) +++ subversion/trunk/tools/dev/wc-ng/bump-to-19.py Thu Dec 30 20:46:50 2010 @@ -212,7 +212,7 @@ def select_subdir(wc_subdir_path): return False else: return True - + def migrate_wc_subdirs(wc_root_path): """Move Subversion metadata from the admin dir of each subdirectory Modified: subversion/trunk/tools/dev/wc-ng/populate-pristine.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-ng/populate-pristine.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/dev/wc-ng/populate-pristine.py (original) +++ subversion/trunk/tools/dev/wc-ng/populate-pristine.py Thu Dec 30 20:46:50 2010 @@ -58,7 +58,7 @@ INSERT_QUERY = """ INTO pristine(checksum,compression,size,refcount,md5_checksum) VALUES (?,?,?,?,?) """ - + def populate(wc_path): conn = open_db(wc_path) sys.stdout.write("Updating '%s': " % wc_path) Modified: subversion/trunk/tools/diff/diff.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff.c?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/diff/diff.c (original) +++ subversion/trunk/tools/diff/diff.c Thu Dec 30 20:46:50 2010 @@ -86,9 +86,9 @@ int main(int argc, const char *argv[]) svn_handle_error2(svn_err, stdout, FALSE, "diff: "); return 2; } - + options_array = apr_array_make(pool, 0, sizeof(const char *)); - + for (i = 1 ; i < argc ; i++) { if (!no_more_options && (argv[i][0] == '-')) Modified: subversion/trunk/tools/dist/collect_sigs.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/collect_sigs.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/dist/collect_sigs.py (original) +++ subversion/trunk/tools/dist/collect_sigs.py Thu Dec 30 20:46:50 2010 @@ -159,7 +159,7 @@ and <tt>END PGP SIGNATURE</tt> lines wil </form> <hr/> ''' % os.getenv('SCRIPT_NAME') - + def split(sigs): Modified: subversion/trunk/tools/hook-scripts/mailer/mailer.py URL: http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/mailer/mailer.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/tools/hook-scripts/mailer/mailer.py (original) +++ subversion/trunk/tools/hook-scripts/mailer/mailer.py Thu Dec 30 20:46:50 2010 @@ -965,7 +965,7 @@ class DifflibDiffContent(): tolines = open(to_file, 'U').readlines() self.diff = difflib.unified_diff(fromlines, tolines, label_from, label_to) - + def __nonzero__(self): # we always have some items return True Modified: subversion/trunk/win-tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1053998&r1=1053997&r2=1053998&view=diff ============================================================================== --- subversion/trunk/win-tests.py (original) +++ subversion/trunk/win-tests.py Thu Dec 30 20:46:50 2010 @@ -483,7 +483,7 @@ class Httpd: fp.write(self._svn_repo('local_tmp')) # And two redirects for the redirect tests - fp.write('RedirectMatch permanent ^/svn-test-work/repositories/' + fp.write('RedirectMatch permanent ^/svn-test-work/repositories/' 'REDIRECT-PERM-(.*)$ /svn-test-work/repositories/$1\n') fp.write('RedirectMatch ^/svn-test-work/repositories/' 'REDIRECT-TEMP-(.*)$ /svn-test-work/repositories/$1\n') @@ -491,7 +491,7 @@ class Httpd: fp.write('TypesConfig ' + self._quote(self.httpd_mime_types) + '\n') fp.write('LogLevel Debug\n') fp.write('HostNameLookups Off\n') - + fp.close() def __del__(self): @@ -685,26 +685,26 @@ else: '-Dtest.rooturl=', '-Dtest.fstype=' + fs_type , '-Dtest.tests=', - - '-Djava.library.path=' + + '-Djava.library.path=' + os.path.join(abs_objdir, 'subversion/bindings/javahl/native'), - '-classpath', + '-classpath', os.path.join(abs_srcdir, 'subversion/bindings/javahl/classes') +';' + gen_obj.junit_path ) - - sys.stderr.flush() + + sys.stderr.flush() print('Running org.apache.subversion tests:') sys.stdout.flush() - + r = subprocess.call(args + tuple(['org.apache.subversion.javahl.RunTests'])) sys.stdout.flush() sys.stderr.flush() if (r != 0): print('[Test runner reported failure]') failed = True - + print('Running org.tigris.subversion tests:') sys.stdout.flush() r = subprocess.call(args + tuple(['org.tigris.subversion.javahl.RunTests'])) @@ -713,7 +713,7 @@ else: if (r != 0): print('[Test runner reported failure]') failed = True - + # Stop service daemon, if any if daemon: del daemon
