You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/04/12 09:44:49 UTC
svn commit: r1467191 [3/4] - in /subversion/trunk: ./ build/generator/
subversion/bindings/javahl/native/
subversion/bindings/javahl/tests/org/apache/subversion/javahl/
subversion/bindings/swig/perl/libsvn_swig_perl/
subversion/bindings/swig/python/lib...
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Fri Apr 12 07:44:37 2013
@@ -350,7 +350,7 @@ svn_cl__merge(apr_getopt_t *os,
/* If no targetpath was specified, see if we can infer it from the
sourcepaths. */
if (! has_explicit_target
- && sourcepath1 && sourcepath2
+ && sourcepath1 && sourcepath2
&& strcmp(targetpath, "") == 0)
{
/* If the sourcepath is a URL, it can only refer to a target in
Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Fri Apr 12 07:44:37 2013
@@ -307,7 +307,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
src_end_revision = src_start_revision;
else
src_end_revision = &(opt_state->end_revision);
-
+
/* Do the real work, depending on the requested data flavor. */
if (opt_state->show_revs == svn_cl__show_revs_merged)
{
@@ -340,7 +340,7 @@ svn_cl__mergeinfo(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("Depth specification options valid only "
"with --show-revs option"));
-
+
SVN_ERR(mergeinfo_summary(source, &src_peg_revision,
target, &tgt_peg_revision,
ctx, pool));
Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Fri Apr 12 07:44:37 2013
@@ -647,7 +647,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
" Size (in bytes)\n"
" Date and time of the last commit\n"),
- {'r', 'v', 'R', opt_depth, opt_incremental, opt_xml,
+ {'r', 'v', 'R', opt_depth, opt_incremental, opt_xml,
opt_include_externals },
{{opt_include_externals, N_("include externals definitions")}} },
@@ -1146,7 +1146,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" The --allow-mixed-revisions option is provided for backward compatibility.\n"
"\n"
" The --revision option has no use and is deprecated.\n"),
- {'r', 'q', opt_force, opt_parents, opt_allow_mixed_revisions,
+ {'r', 'q', opt_force, opt_parents, opt_allow_mixed_revisions,
SVN_CL__LOG_MSG_OPTIONS} },
{ "patch", svn_cl__patch, {0}, N_
Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Fri Apr 12 07:44:37 2013
@@ -1098,7 +1098,7 @@ svn_cl__propset_print_binary_mime_type_w
"operations will stop working on this file\n"),
canon_propval->data,
svn_dirent_local_style(local_abspath, iterpool)));
-
+
}
}
svn_pool_destroy(iterpool);
Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Fri Apr 12 07:44:37 2013
@@ -894,7 +894,7 @@ delete_node_property(void *node_baton, c
"are not enabled for node '%s' in original "
"revision %ld"),
nb->node_path, rb->rev_orig);
-
+
nb->has_props = TRUE;
write_propdel_to_stringbuf(&(nb->props), name);
Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Fri Apr 12 07:44:37 2013
@@ -962,7 +962,7 @@ print_diff_tree(svn_stream_t *out_stream
if (diff_cmd_argc)
{
int i;
- diff_cmd_argv = apr_palloc(pool,
+ diff_cmd_argv = apr_palloc(pool,
diff_cmd_argc * sizeof(char *));
for (i = 0; i < diff_cmd_argc; i++)
SVN_ERR(svn_utf_cstring_to_utf8(&diff_cmd_argv[i],
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Fri Apr 12 07:44:37 2013
@@ -1036,7 +1036,7 @@ sanitize_log_sources(apr_hash_t *revprop
svn_hash_sets(revprops, SVN_PROP_REVISION_LOG,
svn_string_create(message, hash_pool));
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Fri Apr 12 07:44:37 2013
@@ -114,7 +114,7 @@ struct file_baton
/* The action associate with this node. */
enum svn_node_action action;
-
+
/* Flags to trigger dumping props and text. */
svn_boolean_t dump_text;
svn_boolean_t dump_props;
@@ -202,7 +202,7 @@ make_dir_baton(const char *path,
new_db->parent_dir_baton = pb;
new_db->pool = pool;
new_db->repos_relpath = repos_relpath;
- new_db->copyfrom_path = copyfrom_path
+ new_db->copyfrom_path = copyfrom_path
? svn_relpath_canonicalize(copyfrom_path, pool)
: NULL;
new_db->copyfrom_rev = copyfrom_rev;
@@ -556,7 +556,7 @@ dump_pending(struct dump_edit_baton *eb,
/* Some pending properties to dump? */
SVN_ERR(do_dump_props(NULL, eb->stream, db->props, db->deleted_props,
&(db->dump_props), db->pool, scratch_pool));
-
+
/* Some pending newlines to dump? */
SVN_ERR(do_dump_newlines(eb, &(db->dump_newlines), scratch_pool));
}
@@ -590,7 +590,7 @@ open_root(void *edit_baton,
{
struct dump_edit_baton *eb = edit_baton;
struct dir_baton *new_db = NULL;
-
+
/* Clear the per-revision pool after each revision */
svn_pool_clear(eb->pool);
@@ -778,7 +778,7 @@ close_directory(void *dir_baton,
out (at some point in the past, prior to our handling other
nodes), we might need to generate a second "change" record just
to carry the information we've since learned about the
- directory. */
+ directory. */
if ((! this_pending) && (db->dump_props))
{
SVN_ERR(dump_node(db->eb, db->repos_relpath, db, NULL,
@@ -823,13 +823,13 @@ add_file(const char *path,
/* Make the file baton. */
fb = make_file_baton(path, pb, pool);
-
+
/* This might be a replacement -- is the path already deleted? */
val = svn_hash_gets(pb->deleted_entries, path);
/* Detect add-with-history. */
if (ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev))
- {
+ {
fb->copyfrom_path = svn_relpath_canonicalize(copyfrom_path, fb->pool);
fb->copyfrom_rev = copyfrom_rev;
fb->is_copy = TRUE;
@@ -883,7 +883,7 @@ change_dir_prop(void *parent_baton,
{
struct dir_baton *db = parent_baton;
svn_boolean_t this_pending;
-
+
LDR_DBG(("change_dir_prop %p\n", parent_baton));
/* This directory is not pending, but something else is, so handle
@@ -1000,7 +1000,7 @@ close_file(void *file_baton,
struct dump_edit_baton *eb = fb->eb;
apr_finfo_t *info = apr_pcalloc(pool, sizeof(apr_finfo_t));
svn_stringbuf_t *propstring;
-
+
LDR_DBG(("close_file %p\n", file_baton));
SVN_ERR(dump_pending(eb, pool));
Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri Apr 12 07:44:37 2013
@@ -853,7 +853,7 @@ set_revision_property(void *baton,
struct revision_baton *rb = baton;
SVN_ERR(svn_rdump__normalize_prop(name, &value, rb->pool));
-
+
SVN_ERR(svn_repos__validate_prop(name, value, rb->pool));
if (rb->rev > 0)
Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri Apr 12 07:44:37 2013
@@ -378,7 +378,7 @@ init_client_context(svn_client_ctx_t **c
### server will allow it, or at least try to limit all its
### auxiliary GETs/PROPFINDs to happening (well-ordered) on a
### single server connection.
- ###
+ ###
### See http://subversion.tigris.org/issues/show_bug.cgi?id=4116.
*/
cfg_servers = svn_hash_gets(ctx->config, SVN_CONFIG_CATEGORY_SERVERS);
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Fri Apr 12 07:44:37 2013
@@ -246,7 +246,7 @@ log_authz_denied(const char *path,
timestr = svn_time_to_cstring(apr_time_now(), pool);
remote_host = svn_ra_svn_conn_remote_host(conn);
- line = apr_psprintf(pool, "%" APR_PID_T_FMT
+ line = apr_psprintf(pool, "%" APR_PID_T_FMT
" %s %s %s %s Authorization Failed %s%s %s" APR_EOL_STR,
getpid(), timestr,
(remote_host ? remote_host : "-"),
@@ -312,7 +312,7 @@ svn_error_t *load_pwdb_config(server_bat
* placed in *ACCESS_FILE. SERVER baton is used to convert relative paths to
* absolute paths rooted at the server root. REPOS_ROOT is used to calculate
* an absolute URL for repos-relative URLs. */
-static svn_error_t *
+static svn_error_t *
canonicalize_access_file(const char **access_file, server_baton_t *server,
const char *repos_root, apr_pool_t *pool)
{
@@ -3123,7 +3123,7 @@ get_inherited_props(svn_ra_svn_conn_t *c
SVN_ERR(svn_ra_svn__write_proplist(conn, iterpool, iprop->prop_hash));
SVN_ERR(svn_ra_svn__write_tuple(conn, iterpool, "!))!",
iprop->path_or_url));
- }
+ }
SVN_ERR(svn_ra_svn__write_tuple(conn, iterpool, "!))"));
svn_pool_destroy(iterpool);
Modified: subversion/trunk/subversion/svnserve/server.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/server.h?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/server.h (original)
+++ subversion/trunk/subversion/svnserve/server.h Fri Apr 12 07:44:37 2013
@@ -138,7 +138,7 @@ svn_error_t *serve(svn_ra_svn_conn_t *co
apr_pool_t *pool);
/* Load the password database for the listening server based on the
- entries in the SERVER struct.
+ entries in the SERVER struct.
SERVER and CONN must not be NULL. The real errors will be logged with
SERVER and CONN but return generic errors to the client. */
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Fri Apr 12 07:44:37 2013
@@ -1537,17 +1537,17 @@ def authz_del_from_subdir(sbox):
def log_diff_dontdothat(sbox):
"log --diff on dontdothat"
sbox.build(create_wc = False)
-
+
ddt_url = sbox.repo_url.replace('/svn-test-work/', '/ddt-test-work/')
-
+
svntest.actions.run_and_verify_svn(None, None, [],
- 'log', sbox.repo_url,
+ 'log', sbox.repo_url,
'-c', 1, '--diff')
# We should expect a PASS or a proper error message instead of
# svn: E175009: XML parsing failed: (403 Forbidden)
svntest.actions.run_and_verify_svn(None, None, [],
- 'log', ddt_url,
+ 'log', ddt_url,
'-c', 1, '--diff')
Modified: subversion/trunk/subversion/tests/cmdline/autoprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/autoprop_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/autoprop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/autoprop_tests.py Fri Apr 12 07:44:37 2013
@@ -635,7 +635,7 @@ def svn_prop_inheritable_autoprops_add_v
# again, which is not what we are here to test.
if os.name == 'posix':
os.chmod(os.path.join(sbox.wc_dir, 'D', 'rip.bat'), 0664)
-
+
os.chdir(sbox.wc_dir)
svntest.main.run_svn(None, 'add', '.', '--force', '--no-auto-props',
'--config-dir', config_dir)
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Apr 12 07:44:37 2013
@@ -3043,12 +3043,12 @@ def peg_rev_on_non_existent_wc_path(sbox
# test something.
sbox.simple_update()
# This currently fails with ENOENT on A/mu3.
- svntest.actions.run_and_verify_svn(None, ['r2\n'], [],
+ svntest.actions.run_and_verify_svn(None, ['r2\n'], [],
'cat', '-r2', sbox.ospath('A3/mu3') + '@3')
os.chdir(sbox.ospath('A4'))
- svntest.actions.run_and_verify_svn(None, ['r2\n'], [],
+ svntest.actions.run_and_verify_svn(None, ['r2\n'], [],
'cat', '-r2', sbox.ospath('mu3') + '@3')
-
+
########################################################################
# Run the tests
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Fri Apr 12 07:44:37 2013
@@ -150,7 +150,7 @@ def blame_binary(sbox):
svntest.main.run_svn(None, 'propdel', 'svn:mime-type', iota)
svntest.main.run_svn(None, 'ci',
'-m', '', iota)
-
+
# Blame fails when asking about an old revision where the mime-type is binary
exit_code, output, errput = svntest.main.run_svn(2, 'blame', iota + '@3')
if (len(errput) != 1) or (errput[0].find('Skipping') == -1):
Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Fri Apr 12 07:44:37 2013
@@ -2892,7 +2892,7 @@ def commit_danglers(sbox):
A_copied = sbox.ospath('A_copied')
mu_copied = sbox.ospath('A_copied/mu')
- svntest.main.file_write(mu_copied, "xxxx")
+ svntest.main.file_write(mu_copied, "xxxx")
# We already test for this problem for some time
expected_error = "svn: E200009: '.*A_copied' .*exist.*yet.* '.*mu'.*part"
@@ -2936,16 +2936,16 @@ def last_changed_of_copied_subdir(sbox):
E_copied = sbox.ospath('A/B_copied/E')
alpha_copied = sbox.ospath('A/B_copied/E/alpha')
- svntest.main.file_write(alpha_copied, "xxxx")
-
+ svntest.main.file_write(alpha_copied, "xxxx")
+
svntest.main.run_svn(None, 'commit', wc_dir, '-mm')
expected = {'Revision' : '2',
'Last Changed Rev' : '2',
}
svntest.actions.run_and_verify_info([expected], E_copied)
-
-
+
+
########################################################################
# Run the tests
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Apr 12 07:44:37 2013
@@ -4749,7 +4749,7 @@ def mixed_rev_copy_del(sbox):
'-r1',
sbox.ospath('A/B/E/alpha'),
sbox.ospath('A/B/E/beta'))
-
+
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Copy A/B/E to A/B/E_copy
@@ -5217,7 +5217,7 @@ def case_only_rename(sbox):
# Create expected status.
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
-
+
'iota' : Item(status='D ', wc_rev=1, moved_to='IoTa'),
'IoTa' : Item(status='A ', copied='+', wc_rev='-', moved_from='iota'),
'A/B' : Item(status='D ', wc_rev='1', moved_to='A/b'),
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Fri Apr 12 07:44:37 2013
@@ -2867,9 +2867,9 @@ def revert_depth_files(sbox):
"depth immediate+files should revert deleted files"
sbox.build(read_only = True)
-
+
expected_output = "Reverted '" + re.escape(sbox.ospath('A/mu')) + "'"
-
+
# Apply an unrelated delete one level to deep
sbox.simple_rm('A/D/gamma')
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Apr 12 07:44:37 2013
@@ -3388,7 +3388,7 @@ def diff_git_format_wc_wc(sbox):
expected_output = make_git_diff_header(
alpha_copied_path, "A/B/E/alpha_copied",
"revision 0", "working copy",
- copyfrom_path="A/B/E/alpha",
+ copyfrom_path="A/B/E/alpha",
copyfrom_rev='1', cp=True,
text_changes=True) + [
"@@ -1 +1,2 @@\n",
@@ -3983,7 +3983,7 @@ def diff_two_working_copies(sbox):
"@@ -1 +0,0 @@\n",
"-This is the file 'psi'.\n",
]
-
+
# Files in diff may be in any order.
expected_output = svntest.verify.UnorderedOutput(expected_output)
svntest.actions.run_and_verify_svn(None, expected_output, [],
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Fri Apr 12 07:44:37 2013
@@ -2556,7 +2556,7 @@ def commit_include_externals(sbox):
# Assume everything r4, except what is pegged
- expected_status.tweak(wc_rev='4')
+ expected_status.tweak(wc_rev='4')
expected_status.tweak('Xpegged/xiota', 'Xpegged/xE', 'Xpegged/xE/alpha',
'Xpegged/xE/beta', wc_rev=1)
@@ -2781,7 +2781,7 @@ def include_immediate_dir_externals(sbox
#
# >svn st
# X X\XE
- #
+ #
# Performing status on external item at 'X\XE':
# M C:\SVN\src-trunk\...\externals_tests-37\X\XE
# M C:\SVN\src-trunk\...\externals_tests-37\X\XE\alpha
@@ -3048,15 +3048,15 @@ def duplicate_targets(sbox):
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'pg',
'svn:externals', wc_dir)
-@Issue(4225)
+@Issue(4225)
def list_include_externals(sbox):
"list with --include-externals"
-
+
externals_test_setup(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
-
+
svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
repo_url, wc_dir)
@@ -3073,7 +3073,7 @@ def list_include_externals(sbox):
return string
expected_stdout = verify.UnorderedOutput([
- "E/" + "\n",
+ "E/" + "\n",
"F/" + "\n",
"lambda" + "\n",
list_external_string("gamma", B_url ) + "\n",
@@ -3081,7 +3081,7 @@ def list_include_externals(sbox):
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
"OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', B_path)
-
+
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
"OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', B_url)
@@ -3094,10 +3094,10 @@ def list_include_externals(sbox):
"chi" + "\n",
"omega" + "\n",
"psi" + "\n"])
-
+
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
"OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', C_path)
-
+
exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
"OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', C_url)
Modified: subversion/trunk/subversion/tests/cmdline/import_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/import_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/import_tests.py Fri Apr 12 07:44:37 2013
@@ -554,7 +554,7 @@ def import_inherited_ignores(sbox):
svntest.actions.run_and_verify_svn(None, [], [], 'import',
'--config-dir', config_dir,
os.path.join(import_tree_dir,
- 'DIR6', 'file6.foo'),
+ 'DIR6', 'file6.foo'),
sbox.repo_url + '/A/B/E/file6.foo',
'-m', 'This import should fail!')
@@ -563,7 +563,7 @@ def import_inherited_ignores(sbox):
svntest.actions.run_and_verify_svn(None, None, [], 'import', '--no-ignore',
'--config-dir', config_dir,
os.path.join(import_tree_dir,
- 'DIR6', 'file6.foo'),
+ 'DIR6', 'file6.foo'),
sbox.repo_url + '/A/B/E/file6.foo',
'-m', 'import')
expected_output = svntest.verify.UnorderedOutput(
Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Fri Apr 12 07:44:37 2013
@@ -544,7 +544,7 @@ def relpath_escaping(sbox):
'URL' : '.*/path.*with.*space.*',
'Relative URL' : '.*/path.*with.*space.*',
}
-
+
svntest.actions.run_and_verify_info([expected], sbox.ospath(name))
info = svntest.actions.run_and_parse_info(sbox.ospath(name), sbox.ospath(name2))
Modified: subversion/trunk/subversion/tests/cmdline/iprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/iprop_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/iprop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/iprop_tests.py Fri Apr 12 07:44:37 2013
@@ -99,7 +99,7 @@ def iprops_basic_working(sbox):
D_path, expected_iprops, expected_explicit_props)
### Propget Directory Targets
-
+
# Propget directory target with only explicit props.
expected_iprops = {}
expected_explicit_props = {'RootProp2' : 'Root-Prop-Val2'}
@@ -315,7 +315,7 @@ def iprops_switched_subtrees(sbox):
svntest.main.run_svn(None, 'copy', sbox.repo_url + '/A',
sbox.repo_url + '/branch2', '-m', 'Make branch2')
-
+
# Create a root property and two branch properties
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
sbox.simple_propset('Root-Prop-1', 'Root-Prop-Val1', '.')
@@ -430,7 +430,7 @@ def iprops_pegged_wc_targets(sbox):
sbox.simple_propset('RootProp1', 'Root-Prop-Val-1-set-in-r2', '.')
sbox.simple_propset('RootProp2', 'Root-Prop-Val-2-set-in-r2', '.')
sbox.simple_propset('D-Prop', 'D-Prop-Val-set-in-r2', 'A/D')
- svntest.main.file_write(alpha_path, "Edit in r2.\n")
+ svntest.main.file_write(alpha_path, "Edit in r2.\n")
svntest.main.run_svn(None, 'commit', '-m', 'Add some properties',
wc_dir)
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri Apr 12 07:44:37 2013
@@ -1779,14 +1779,14 @@ def locks_stick_over_switch(sbox):
switched_status.tweak('iota', writelocked='K')
switched_status.tweak('A', switched='S')
- svntest.actions.run_and_verify_switch(wc_dir, sbox.ospath('A'),
+ svntest.actions.run_and_verify_switch(wc_dir, sbox.ospath('A'),
repo_url + '/AA',
expected_output, None, switched_status)
# And now switch back to verify that the locks reappear
expected_output = svntest.wc.State(wc_dir, {
})
- svntest.actions.run_and_verify_switch(wc_dir, sbox.ospath('A'),
+ svntest.actions.run_and_verify_switch(wc_dir, sbox.ospath('A'),
repo_url + '/A',
expected_output, None, expected_status)
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Fri Apr 12 07:44:37 2013
@@ -2220,7 +2220,7 @@ def log_diff_moved(sbox):
sbox.simple_move('A/mu2', 'A/mu3')
svntest.main.file_append(sbox.ospath('A/mu3'), "now mu3\n")
sbox.simple_commit()
-
+
mu_at_1 = sbox.repo_url + '/A/mu@1'
mu3_at_3 = sbox.repo_url + '/A/mu3@3'
Modified: subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Fri Apr 12 07:44:37 2013
@@ -839,7 +839,7 @@ def subtree_to_and_fro(sbox):
"|(\n)"
"|(.*apr_err.*)", # In case of debug build
None,
- True) # Match *all* lines of stdout
+ True) # Match *all* lines of stdout
#----------------------------------------------------------------------
# Automatic merges ignore subtree mergeinfo gaps older than the last rev
@@ -888,7 +888,7 @@ def merge_to_reverse_cherry_subtree_to_m
# Try an automatic sync merge from ^/A to A_COPY. Revision 5 should be
# merged to A_COPY/B as its subtree mergeinfo reveals that rev is missing,
# like so:
- #
+ #
# >svn merge ^/A A_COPY
# --- Merging r5 into 'A_COPY\B':
# U A_COPY\B\E\beta
@@ -1166,7 +1166,7 @@ def effective_sync_results_in_reintegrat
# This should work because since the resolution of
# http://subversion.tigris.org/issues/show_bug.cgi?id=3577
# if B is *effectively* synced with A, then B can be reintegrated
- # to A.
+ # to A.
sbox.simple_update()
expected_output = [
"--- Merging differences between repository URLs into '" +
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr 12 07:44:37 2013
@@ -1834,7 +1834,7 @@ def merge_into_missing(sbox):
})
expected_mergeinfo_output = wc.State(F_path, {
})
-
+
svntest.actions.run_and_verify_merge(F_path, '1', '2', F_url, None,
expected_output,
expected_mergeinfo_output,
@@ -17487,8 +17487,8 @@ def merge_source_with_replacement(sbox):
psi_COPY_path = sbox.ospath('A_COPY/D/H/psi')
rho_COPY_path = sbox.ospath('A_COPY/D/G/rho')
omega_COPY_path = sbox.ospath('A_COPY/D/H/omega')
-
- # branch A@1 to A_COPY in r2, then make a few edits under A in r3-6:
+
+ # branch A@1 to A_COPY in r2, then make a few edits under A in r3-6:
wc_disk, wc_status = set_up_branch(sbox)
# r7 Delete A, replace it with A@5, effectively reverting the change
@@ -17590,7 +17590,7 @@ def reverse_merge_with_rename(sbox):
rho_COPY_path = sbox.ospath('A_COPY/D/G/rho')
omega_COPY_path = sbox.ospath('A_COPY/D/H/omega')
- # branch A@1 to A_COPY in r2, then make a few edits under A in r3-6:
+ # branch A@1 to A_COPY in r2, then make a few edits under A in r3-6:
wc_disk, wc_status = set_up_branch(sbox)
# r7 - Rename ^/A to ^/trunk.
@@ -17805,7 +17805,7 @@ def merge_with_added_subtrees_with_merge
# vvvvvvvvvvvvvvvvvvvv
# U A_COPY_2\C\X\Y\Z
# ^^^^^^^^^^^^^^^^^^^^
- #
+ #
# >svn pl -vR A_COPY_2
# Properties on 'A_COPY_2':
# svn:mergeinfo
@@ -18247,7 +18247,7 @@ def merge_properties_on_adds(sbox):
# For fun, also check the status: 'svn status' suppresses the M from AM.
# G = sbox.ospath('G')
- #
+ #
# expected_status = wc.State('G', {
# '' : Item(status=' M', wc_rev='2'),
# 'pi' : Item(status=' ', wc_rev='2'),
@@ -18792,7 +18792,7 @@ def single_editor_drive_merge_notificati
D_copy_path + "':\n",
" U " + D_copy_path + "\n",
"--- Eliding mergeinfo from '" + D_copy_path + "':\n",
- " U " + D_copy_path + "\n"])
+ " U " + D_copy_path + "\n"])
svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
'-r9:2', sbox.repo_url + '/A',
A_copy_path)
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Apr 12 07:44:37 2013
@@ -1329,7 +1329,7 @@ def tree_conflicts_merge_edit_onto_missi
})
# Currently this test fails because some parts of the merge
- # start succeeding.
+ # start succeeding.
svntest.deeptrees.deep_trees_run_tests_scheme_for_merge(sbox,
[ DeepTreesTestCase(
"local_tree_missing_incoming_leaf_edit",
Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Fri Apr 12 07:44:37 2013
@@ -95,14 +95,14 @@ def build_incoming_changes_file(sbox, so
sbox.simple_propdel("foo", dest)
sbox.simple_commit(message="Delete property on destination of moved file")
- # r13 = Remove destination again (not needed for any test just cleanup).
+ # r13 = Remove destination again (not needed for any test just cleanup).
sbox.simple_rm(dest)
sbox.simple_commit(message="Remove destination (cleanup)")
# r14 = Add property on source of moved file.
sbox.simple_propset("foo", "bar", source)
sbox.simple_commit(message="Add property on source of moved file")
-
+
# r15 = Modify property on source of moved file.
sbox.simple_propset("foo", "baz", source)
sbox.simple_commit(message="Modify property on source of moved file")
@@ -141,11 +141,11 @@ def move_file_test(sbox, source, dest, m
source_path = sbox.ospath(source)
dest_path = sbox.ospath(dest)
- # Deal with if there's no resolves key, as in we're not going to
+ # Deal with if there's no resolves key, as in we're not going to
# do a resolve.
if not 'resolves' in test or not test['resolves']:
test['resolves'] = {None: None}
-
+
# Do the test for every type of resolve provided.
for resolve_accept in test['resolves'].keys():
@@ -157,7 +157,7 @@ def move_file_test(sbox, source, dest, m
# execute the move
move_func(test['start_rev'])
- # update to end_rev, which will create a conflict
+ # update to end_rev, which will create a conflict
# TODO: Limit the property checks to only when we're doing something with
# properties.
svntest.actions.run_and_verify_update(wc_dir, test['up_output'],
@@ -177,7 +177,7 @@ def move_file_test(sbox, source, dest, m
if not 'output' in resolve:
resolve['output'] = None
if not 'error' in resolve:
- resolve['error'] = []
+ resolve['error'] = []
if not 'disk' in resolve:
resolve['disk'] = None
if 'revert_paths' in resolve:
@@ -197,7 +197,7 @@ def move_file_test(sbox, source, dest, m
if resolve['disk']:
svntest.actions.verify_disk(wc_dir, resolve['disk'], True)
- # revert to preprare for the next test
+ # revert to preprare for the next test
svntest.actions.run_and_verify_revert(revert_paths, '-R', wc_dir)
# tests is an array of test dictionaries that move_file_test above will take
@@ -240,11 +240,11 @@ def build_simple_file_move_tests(sbox, s
mc['output'] = svntest.verify.ExpectedOutput(
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
)
- mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
mc['status'].tweak(source, status='D ', moved_to=dest)
mc['status'].add({dest: Item(status='A ', moved_from=source,
copied='+', wc_rev='-')})
- mc['disk'] = test['up_disk'].copy()
+ mc['disk'] = test['up_disk'].copy()
mc['disk'].tweak(dest, contents="This is the file 'lambda'.\nmodified\n")
# theirs-conflict doesn't work
tc = {}
@@ -259,10 +259,10 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % source_path,
]
)
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
- working['disk'] = test['up_disk']
+ working['disk'] = test['up_disk']
test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
@@ -301,7 +301,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
)
# move is broken now
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['status'].remove(source)
working['disk'] = test['up_disk']
@@ -346,7 +346,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
)
# XXX: Not sure this status is really correct here
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='! ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
@@ -389,7 +389,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -435,7 +435,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -503,7 +503,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -547,7 +547,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -560,7 +560,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming property addition to dest (r7-10)
test = {}
test['start_rev'] = 7
- test['end_rev'] = 10
+ test['end_rev'] = 10
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -591,7 +591,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -604,7 +604,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming property modification to dest (r7-11)
test = {}
test['start_rev'] = 7
- test['end_rev'] = 11
+ test['end_rev'] = 11
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -635,7 +635,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -648,7 +648,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming property deletion to dest (r7-12)
test = {}
test['start_rev'] = 7
- test['end_rev'] = 12
+ test['end_rev'] = 12
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -679,7 +679,7 @@ def build_simple_file_move_tests(sbox, s
"Resolved conflicted state of '%s'\n" % dest_path, match_all=False
)
# working converts the move into a replacement
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ', moved_to=dest)
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
@@ -692,7 +692,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming property addition to source (r13-14)
test = {}
test['start_rev'] = 13
- test['end_rev'] = 14
+ test['end_rev'] = 14
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -714,7 +714,7 @@ def build_simple_file_move_tests(sbox, s
mc['output'] = svntest.verify.ExpectedOutput(
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
)
- mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
mc['status'].tweak(source, status='D ', moved_to=dest)
mc['status'].add({dest: Item(status='A ', moved_from=source,
copied='+', wc_rev='-')})
@@ -733,7 +733,7 @@ def build_simple_file_move_tests(sbox, s
]
)
# XXX: working breaks the move? Is that right?
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
@@ -745,7 +745,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming property modification to source (r14-15)
test = {}
test['start_rev'] = 14
- test['end_rev'] = 15
+ test['end_rev'] = 15
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -767,7 +767,7 @@ def build_simple_file_move_tests(sbox, s
mc['output'] = svntest.verify.ExpectedOutput(
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
)
- mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
mc['status'].tweak(source, status='D ', moved_to=dest)
mc['status'].add({dest: Item(status='A ', moved_from=source,
copied='+', wc_rev='-')})
@@ -786,7 +786,7 @@ def build_simple_file_move_tests(sbox, s
]
)
# XXX: working breaks the move? Is that right?
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
@@ -798,7 +798,7 @@ def build_simple_file_move_tests(sbox, s
# move and update with incoming property deletion to source (r15-16)
test = {}
test['start_rev'] = 15
- test['end_rev'] = 16
+ test['end_rev'] = 16
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -820,7 +820,7 @@ def build_simple_file_move_tests(sbox, s
mc['output'] = svntest.verify.ExpectedOutput(
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
)
- mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
mc['status'].tweak(source, status='D ', moved_to=dest)
mc['status'].add({dest: Item(status='A ', moved_from=source,
copied='+', wc_rev='-')})
@@ -839,7 +839,7 @@ def build_simple_file_move_tests(sbox, s
]
)
# XXX: working breaks the move? Is that right?
- working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+ working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
@@ -853,7 +853,7 @@ def build_simple_file_move_tests(sbox, s
# showed no conflict at all on udpate.
test = {}
test['start_rev'] = 16
- test['end_rev'] = 17
+ test['end_rev'] = 17
test['start_output'] = None
test['start_disk'] = None
test['start_status'] = None
@@ -905,9 +905,9 @@ def build_simple_file_move_func(sbox, so
def move_func(rev):
# execute the move
svntest.actions.run_and_verify_svn(None, None, [], "move",
- source_path, dest_path)
+ source_path, dest_path)
if move_func.extra_mv_tests:
- mv_status = svntest.actions.get_virginal_state(wc_dir, rev)
+ mv_status = svntest.actions.get_virginal_state(wc_dir, rev)
mv_status.tweak(source, status='D ', moved_to=dest)
mv_status.add({dest: Item(status='A ', moved_from=source,
copied='+', wc_rev='-')})
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Fri Apr 12 07:44:37 2013
@@ -4656,7 +4656,7 @@ def patch_with_custom_keywords(sbox):
svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
expected_output, expected_disk,
expected_status, expected_skip)
-
+
########################################################################
#Run the tests
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Apr 12 07:44:37 2013
@@ -2603,7 +2603,7 @@ def peg_rev_base_working(sbox):
sbox.build()
wc_dir = sbox.wc_dir
-
+
# set up a local prop mod
svntest.actions.set_prop('ordinal', 'ninth\n', sbox.ospath('iota'))
sbox.simple_commit(message='r2')
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Apr 12 07:44:37 2013
@@ -792,7 +792,7 @@ def status_of_missing_dir_after_revert(s
svntest.main.safe_rmtree(A_D_G_path)
expected_status.tweak('A/D/G', status='! ')
-
+
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# When using single-db, we can get back to the virginal state.
@@ -1599,13 +1599,13 @@ def revert_nonexistent(sbox):
@Issue(4168)
def revert_obstructing_wc(sbox):
"revert with an obstructing working copy"
-
+
sbox.build(create_wc=False, read_only=True)
wc_dir = sbox.wc_dir
-
+
expected_output = svntest.wc.State(wc_dir, {})
- expected_disk = svntest.wc.State(wc_dir, {})
-
+ expected_disk = svntest.wc.State(wc_dir, {})
+
# Checkout wc as depth empty
svntest.actions.run_and_verify_checkout(sbox.repo_url, wc_dir,
expected_output, expected_disk,
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Apr 12 07:44:37 2013
@@ -1528,7 +1528,7 @@ def status_depth_update(sbox):
#----------------------------------------------------------------------
def status_depth_update_local_modifications(sbox):
"run 'status --depth=X -u' with local changes"
-
+
sbox.build()
wc_dir = sbox.wc_dir
A_path = sbox.ospath('A')
@@ -1978,7 +1978,7 @@ def status_not_present(sbox):
sbox.ospath('no-file'))
# Skip this test is a .svn dir exists in the root directory
-@Skip(lambda: os.path.exists("/%s" % svntest.main.get_admin_name()))
+@Skip(lambda: os.path.exists("/%s" % svntest.main.get_admin_name()))
def status_unversioned_dir(sbox):
"status on unversioned dir"
sbox.build(read_only = True, create_wc = False)
Modified: subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py Fri Apr 12 07:44:37 2013
@@ -90,7 +90,7 @@ def svnauthz_validate_file_test(sbox):
(authz_fd, authz_path) = tempfile.mkstemp()
authz_content = "[/]\n* = rw\n"
svntest.main.file_write(authz_path, authz_content)
-
+
# Valid authz file
svntest.actions.run_and_verify_svnauthz("Valid authz file", None, None,
0, False, "validate", authz_path)
@@ -162,7 +162,7 @@ def svnauthz_validate_txn_test(sbox):
repr([('validate', 'A/authz')]))
svntest.main.create_python_hook_script(pre_commit_hook, hook_instance)
- # Create an authz file
+ # Create an authz file
authz_content = "[/]\n* = rw\n"
authz_path = os.path.join(wc_dir, 'A/authz')
svntest.main.file_write(authz_path, authz_content)
@@ -249,7 +249,7 @@ def svnauthz_accessof_file_test(sbox):
"--path", "/jokes", "--username",
"groucho")
- # User groucho specified on /jokes with the repo comedy will be rw
+ # User groucho specified on /jokes with the repo comedy will be rw
svntest.actions.run_and_verify_svnauthz("User access on path with repo",
["rw\n"], None, 0, False, "accessof",
authz_path, "--path", "/jokes",
@@ -318,13 +318,13 @@ def svnauthz_accessof_repo_test(sbox):
"--path", "/jokes", "--username",
"groucho")
- # User groucho specified on /jokes with the repo comedy will be rw
+ # User groucho specified on /jokes with the repo comedy will be rw
svntest.actions.run_and_verify_svnauthz("User access on path with repo",
["rw\n"], None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy")
-
+
def svnauthz_accessof_groups_file_test(sbox):
"test 'svnauthz accessof --groups-file' on files"
@@ -359,7 +359,7 @@ def svnauthz_accessof_groups_file_test(s
["no\n"], None,
0, False, "accessof", authz_path,
"--groups-file", groups_path,
- "--username", "groucho")
+ "--username", "groucho")
# Anonymous access specified on /jokes with the repo comedy will be no.
svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
@@ -449,7 +449,7 @@ def svnauthz_accessof_groups_repo_test(s
["no\n"], None,
0, False, "accessof", authz_url,
"--groups-file", groups_url,
- "--username", "groucho")
+ "--username", "groucho")
# Anonymous access specified on /jokes with the repo comedy will be no.
svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
@@ -592,7 +592,7 @@ def svnauthz_accessof_is_file_test(sbox)
"--username", "groucho",
"--is", "no")
- # User groucho specified on /jokes with the repo comedy will be rw
+ # User groucho specified on /jokes with the repo comedy will be rw
# Test --is rw returns 0.
svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is rw",
None, None, 0, False, "accessof",
@@ -623,7 +623,7 @@ def svnauthz_accessof_is_file_test(sbox)
match_all=False
)
svntest.actions.run_and_verify_svnauthz("--is with invalid authz file",
- None, expected_out, 1, False,
+ None, expected_out, 1, False,
"accessof", authz_path, "--path",
"/jokes", "--username", "groucho",
"--repository", "comedy", "--is",
@@ -761,7 +761,7 @@ def svnauthz_accessof_is_repo_test(sbox)
"--username", "groucho",
"--is", "no")
- # User groucho specified on /jokes with the repo comedy will be rw
+ # User groucho specified on /jokes with the repo comedy will be rw
# Test --is rw returns 0.
svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is rw",
None, None, 0, False, "accessof",
@@ -818,7 +818,7 @@ def svnauthz_accessof_txn_test(sbox):
'--is rw A/authz')]))
svntest.main.create_python_hook_script(pre_commit_hook, hook_instance)
- # Create an authz file
+ # Create an authz file
authz_content = "[/]\n* = rw\n"
authz_path = os.path.join(wc_dir, 'A/authz')
svntest.main.file_write(authz_path, authz_content)
@@ -875,9 +875,9 @@ def svnauthz_accessof_txn_test(sbox):
def svnauthz_compat_mode_file_test(sbox):
"test 'svnauthz-validate' compatability mode file"
-
- # Create an authz file
+
+ # Create an authz file
(authz_fd, authz_path) = tempfile.mkstemp()
authz_content = "[/]\n* = rw\n"
svntest.main.file_write(authz_path, authz_content)
@@ -912,7 +912,7 @@ def svnauthz_compat_mode_repo_test(sbox)
wc_dir = sbox.wc_dir
repo_url = sbox.repo_url
- # Create an authz file
+ # Create an authz file
authz_content = "[/]\n* = rw\n"
authz_path = os.path.join(wc_dir, 'A/authz')
svntest.main.file_write(authz_path, authz_content)
@@ -944,7 +944,7 @@ def svnauthz_compat_mode_repo_test(sbox)
authz_path)
# Check a non-existant url.
- # Exit code really should be 2 since this is an operational error.
+ # 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,
repo_url + "/zilch"
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Fri Apr 12 07:44:37 2013
@@ -677,7 +677,7 @@ def accepts_deltas(sbox):
load_and_verify_dumpstream(sbox, [], [], expected_revs, True, dump_out,
'--ignore-uuid')
-
+
@Issue(4234)
def dumpfilter_targets_expect_leading_slash_prefixes(sbox):
Modified: subversion/trunk/subversion/tests/cmdline/svneditor.bat
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svneditor.bat?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svneditor.bat (original)
+++ subversion/trunk/subversion/tests/cmdline/svneditor.bat Fri Apr 12 07:44:37 2013
@@ -19,7 +19,7 @@ rem specific language governing permissi
rem under the License.
rem
rem
-rem the svneditor.py script is expected to be in the same directory as the
+rem the svneditor.py script is expected to be in the same directory as the
rem .bat file
rem SVN_TEST_PYTHON set by svntest/main.py
"%SVN_TEST_PYTHON%" "%~dp0\svneditor.py" %*
Modified: subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py Fri Apr 12 07:44:37 2013
@@ -375,7 +375,7 @@ def too_many_log_messages(sbox):
svntest.main.file_append(msg_file, 'some log message')
err_msg = ["svnmucc: E205000: --message (-m), --file (-F), and "
"--with-revprop=svn:log are mutually exclusive"]
-
+
xtest_svnmucc(sbox.repo_url, err_msg,
'--non-interactive',
'-m', 'log msg',
@@ -397,11 +397,11 @@ def too_many_log_messages(sbox):
'-F', msg_file,
'--with-revprop', 'svn:log=proppy log message',
'mkdir', 'A/subdir')
-
+
@Issues(3418)
def no_log_msg_non_interactive(sbox):
"test non-interactive without a log message"
-
+
sbox.build(create_wc=False)
xtest_svnmucc(sbox.repo_url,
["svnmucc: E205001: Cannot invoke editor to get log message "
@@ -409,7 +409,7 @@ def no_log_msg_non_interactive(sbox):
], #---------
'--non-interactive',
'mkdir', 'A/subdir')
-
+
######################################################################
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri Apr 12 07:44:37 2013
@@ -367,7 +367,7 @@ def copy_bad_line_endings_load(sbox):
"load: inconsistent line endings in svn:* props"
run_load_test(sbox, "copy-bad-line-endings.dump",
expected_dumpfile_name="copy-bad-line-endings.expected.dump")
-
+
def copy_bad_line_endings2_dump(sbox):
"dump: non-LF line endings in svn:* props"
run_dump_test(sbox, "copy-bad-line-endings2.dump",
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Fri Apr 12 07:44:37 2013
@@ -1628,7 +1628,7 @@ def run_and_verify_inherited_prop_xml(pa
expected_iprops = {}
for x in expected_inherited_props:
if sandbox.is_url(x):
- expected_iprops[x] = expected_inherited_props[x]
+ expected_iprops[x] = expected_inherited_props[x]
else:
expected_iprops[os.path.abspath(x)] = expected_inherited_props[x]
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri Apr 12 07:44:37 2013
@@ -520,13 +520,13 @@ def run_command_stdin(command, error_exp
*varargs)
def _line_contains_repos_diskpath(line):
- # ### Note: this assumes that either svn-test-work isn't a symlink,
+ # ### Note: this assumes that either svn-test-work isn't a symlink,
# ### or the diskpath isn't realpath()'d somewhere on the way from
# ### the server's configuration and the client's stderr. We could
# ### check for both the symlinked path and the realpath.
return \
os.path.join('cmdline', 'svn-test-work', 'repositories') in line \
- or os.path.join('cmdline', 'svn-test-work', 'local_tmp', 'repos') in line
+ or os.path.join('cmdline', 'svn-test-work', 'local_tmp', 'repos') in line
for lines, name in [[stdout_lines, "stdout"], [stderr_lines, "stderr"]]:
if is_ra_type_file() or 'svnadmin' in command or 'svnlook' in command:
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Apr 12 07:44:37 2013
@@ -6015,7 +6015,7 @@ def update_edit_delete_obstruction(sbox)
'A/D/H' : Item(status=' ', treeconflict='U'),
'A/D/H/chi' : Item(status=' ', treeconflict='D'),
'A/B' : Item(prev_status=' ', prev_treeconflict='D', # Replacement
- status=' ', treeconflict='A'),
+ status=' ', treeconflict='A'),
'iota' : Item(status='A ', prev_status='D '), # Replacement
})
@@ -6277,7 +6277,7 @@ def update_removes_switched(sbox):
'C' : Item(status=' ', wc_rev='3'),
'mu' : Item(status=' ', wc_rev='3'),
})
-
+
# And this final update brings back the node, as it was before switching.
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
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=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Fri Apr 12 07:44:37 2013
@@ -4947,7 +4947,7 @@ filename_trailing_newline(const svn_test
svn_revnum_t youngest_rev = 0;
svn_error_t *err;
svn_boolean_t allow_newlines;
-
+
/* Some filesystem implementations can handle newlines in filenames
* and can be white-listed here.
* Currently, only BDB supports \n in filenames. */
Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Fri Apr 12 07:44:37 2013
@@ -256,7 +256,7 @@ large_log(svn_revnum_t rev, apr_size_t l
svn_stringbuf_appendcstr(temp, "A ");
for (i = 0; i < count; ++i)
svn_stringbuf_appendcstr(temp, "very, ");
-
+
svn_stringbuf_appendcstr(temp,
apr_psprintf(pool, "very long message for rev %ld, indeed", rev));
@@ -762,7 +762,7 @@ file_hint_at_shard_boundary(const svn_te
subpool = svn_pool_create(pool);
SVN_ERR(svn_fs_open(&fs, REPO_NAME, NULL, subpool));
- /* Revision = SHARD_SIZE */
+ /* Revision = SHARD_SIZE */
file_contents = get_rev_contents(SHARD_SIZE, subpool);
SVN_ERR(svn_fs_begin_txn(&txn, fs, MAX_REV, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
@@ -781,7 +781,7 @@ file_hint_at_shard_boundary(const svn_te
/* Close the repo. */
svn_pool_destroy(subpool);
- return err;
+ return err;
}
#undef REPO_NAME
#undef MAX_REV
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Fri Apr 12 07:44:37 2013
@@ -1423,15 +1423,15 @@ 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 not error out when must_exist is FALSE.
* Verify non-existant 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.
*/
/* What we'll put in the authz file, it's simple since we're not testing
- * the parsing, just that we got what we expected. */
- authz_contents =
+ * the parsing, just that we got what we expected. */
+ authz_contents =
"" NL
"" NL
"[/]" NL
@@ -1451,7 +1451,7 @@ in_repo_authz(const svn_test_opts_t *opt
pool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));
SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
-
+
repos_root = svn_repos_path(repos, pool);
SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_url, repos_root, pool));
authz_url = apr_pstrcat(pool, repos_url, "/authz", (char *)NULL);
@@ -1460,12 +1460,12 @@ in_repo_authz(const svn_test_opts_t *opt
/* absolute file URL. */
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-existant 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-existant 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,
@@ -3272,7 +3272,7 @@ test_repos_info(const svn_test_opts_t *o
svn_version_t v1_0_0 = {1, 0, 0, ""};
svn_version_t v1_4_0 = {1, 4, 0, ""};
int repos_format;
-
+
opts2 = *opts;
opts2.server_minor_version = 3;
Modified: subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c Fri Apr 12 07:44:37 2013
@@ -103,7 +103,7 @@ test_pseudo_md5(apr_pool_t *pool)
/* the checksums shall also be different from "proper" MD5 */
SVN_ERR(svn_checksum(&checksum, svn_checksum_md5, input, 15, pool));
SVN_TEST_ASSERT(memcmp(digest_15, checksum->digest, sizeof(digest_15)));
-
+
SVN_ERR(svn_checksum(&checksum, svn_checksum_md5, input, 31, pool));
SVN_TEST_ASSERT(memcmp(digest_31, checksum->digest, sizeof(digest_15)));
@@ -122,8 +122,8 @@ zero_match(apr_pool_t *pool)
svn_checksum_t *B_md5;
svn_checksum_t *A_sha1;
svn_checksum_t *B_sha1;
-
-
+
+
zero_md5 = svn_checksum_create(svn_checksum_md5, pool);
SVN_ERR(svn_checksum_clear(zero_md5));
SVN_ERR(svn_checksum(&A_md5, svn_checksum_md5, "A", 1, pool));
Modified: subversion/trunk/subversion/tests/libsvn_subr/compat-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/compat-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/compat-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/compat-test.c Fri Apr 12 07:44:37 2013
@@ -162,7 +162,7 @@ test_version_parsing(apr_pool_t *pool)
}
}
svn_pool_destroy(iterpool);
-
+
return SVN_NO_ERROR;
}
@@ -204,7 +204,7 @@ test_version_at_least(apr_pool_t *pool)
return svn_error_create(SVN_ERR_TEST_FAILED, NULL,
"Expected at-least to be TRUE; got FALSE");
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c Fri Apr 12 07:44:37 2013
@@ -78,6 +78,6 @@ struct svn_test_descriptor_t test_funcs[
{
SVN_TEST_NULL,
SVN_TEST_PASS2(check_error_codes_unique,
- "check that error codes are unique"),
+ "check that error codes are unique"),
SVN_TEST_NULL
};
Modified: subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c Fri Apr 12 07:44:37 2013
@@ -118,7 +118,7 @@ static apr_status_t
cleanup_test_shm(void *arg)
{
apr_pool_t *pool = arg;
-
+
svn_error_clear(svn_atomic_namespace__cleanup(name_namespace, pool));
svn_error_clear(svn_atomic_namespace__cleanup(name_namespace1, pool));
svn_error_clear(svn_atomic_namespace__cleanup(name_namespace2, pool));
Modified: subversion/trunk/subversion/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/path-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/path-test.c Fri Apr 12 07:44:37 2013
@@ -1685,7 +1685,7 @@ test_path_resolve_repos_relative_url(apr
tests[i].repos_root_url,
result, tests[i].absolute_url);
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/string-test.c?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/string-test.c Fri Apr 12 07:44:37 2013
@@ -564,7 +564,7 @@ test_stringbuf_insert(apr_pool_t *pool)
svn_stringbuf_insert(a, 6, a->data + 1, 1);
SVN_TEST_STRING_ASSERT(a->data, "test hello, ");
-
+
svn_stringbuf_insert(a, 12, "world class", 5);
SVN_TEST_STRING_ASSERT(a->data, "test hello, world");
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Fri Apr 12 07:44:37 2013
@@ -7,9 +7,9 @@ REM regarding copyright ownership. Th
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd Fri Apr 12 07:44:37 2013
@@ -7,9 +7,9 @@ REM regarding copyright ownership. Th
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,7 +30,7 @@ IF ERRORLEVEL 1 (
)
msbuild subversion_vcnet.sln /p:Configuration=Debug /p:Platform=win32 /t:__JAVAHL__ /t:__JAVAHL_TESTS__
-IF ERRORLEVEL 1 EXIT /B 1
+IF ERRORLEVEL 1 EXIT /B 1
msbuild subversion_vcnet.sln /p:Configuration=Release /p:Platform=win32 /t:__SWIG_PYTHON__ /t:__SWIG_PERL__
-IF ERRORLEVEL 1 EXIT /B 1
+IF ERRORLEVEL 1 EXIT /B 1
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd Fri Apr 12 07:44:37 2013
@@ -7,9 +7,9 @@ REM regarding copyright ownership. Th
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Fri Apr 12 07:44:37 2013
@@ -7,9 +7,9 @@ REM regarding copyright ownership. Th
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd Fri Apr 12 07:44:37 2013
@@ -7,9 +7,9 @@ REM regarding copyright ownership. Th
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Fri Apr 12 07:44:37 2013
@@ -7,9 +7,9 @@ REM regarding copyright ownership. Th
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat Fri Apr 12 07:44:37 2013
@@ -5,9 +5,9 @@ REM regarding copyright ownership.
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat Fri Apr 12 07:44:37 2013
@@ -5,9 +5,9 @@ REM regarding copyright ownership.
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat Fri Apr 12 07:44:37 2013
@@ -5,9 +5,9 @@ REM regarding copyright ownership.
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified: subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat?rev=1467191&r1=1467190&r2=1467191&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat Fri Apr 12 07:44:37 2013
@@ -5,9 +5,9 @@ REM regarding copyright ownership.
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
-REM
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing,
REM software distributed under the License is distributed on an
REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,7 +34,7 @@ EXIT 3
:ra_local
time /T
-python win-tests.py %TEST_DIR%\%FS_TYPE% -f %FS_TYPE% -c -r
+python win-tests.py %TEST_DIR%\%FS_TYPE% -f %FS_TYPE% -c -r
if ERRORLEVEL 1 set ERR=1
time /T
echo.