You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/02/29 16:30:31 UTC
svn commit: r1295152 [2/2] - in /subversion/trunk: build/generator/
subversion/bindings/javahl/native/
subversion/bindings/javahl/tests/org/apache/subversion/javahl/
subversion/bindings/swig/python/svn/ subversion/include/
subversion/include/private/ s...
Modified: subversion/trunk/subversion/mod_dav_svn/liveprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/liveprops.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/liveprops.c Wed Feb 29 15:30:27 2012
@@ -381,7 +381,7 @@ insert_prop_internal(const dav_resource
scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't get created-rev of '%s': "
"%s",
@@ -404,7 +404,7 @@ insert_prop_internal(const dav_resource
scratch_pool);
if (serr)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't get author of r%ld: "
"%s",
@@ -439,7 +439,7 @@ insert_prop_internal(const dav_resource
resource->info->repos_path, scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't get filesize of '%s': "
"%s",
@@ -503,7 +503,7 @@ insert_prop_internal(const dav_resource
there's no point even checking. No matter what the
error is, we can't claim to have a mime type for
this resource. */
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, serr->apr_err,
resource->info->r, "%s", serr->message);
svn_error_clear(serr);
return DAV_PROP_INSERT_NOTDEF;
@@ -558,7 +558,7 @@ insert_prop_internal(const dav_resource
scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't get youngest revision in '%s': "
"%s",
@@ -638,7 +638,7 @@ insert_prop_internal(const dav_resource
scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't get created-rev of '%s': "
"%s",
@@ -686,7 +686,7 @@ insert_prop_internal(const dav_resource
scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't fetch or compute MD5 checksum of '%s': "
"%s",
@@ -714,7 +714,7 @@ insert_prop_internal(const dav_resource
serr = svn_fs_get_uuid(resource->info->repos->fs, &value, scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't fetch UUID of '%s': "
"%s",
@@ -739,7 +739,7 @@ insert_prop_internal(const dav_resource
resource->info->repos_path, scratch_pool);
if (serr != NULL)
{
- ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, serr->apr_err,
resource->info->r,
"Can't fetch proplist of '%s': "
"%s",
Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Wed Feb 29 15:30:27 2012
@@ -559,7 +559,7 @@ SVNHooksEnv_cmd(cmd_parms *cmd, void *co
{
svn_stringbuf_appendbyte(buf, '=');
svn_stringbuf_appendcstr(buf, APR_ARRAY_IDX(var, i, const char *));
- }
+ }
val = apr_pstrdup(apr_hash_pool_get(conf->hooks_env), buf->data);
}
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Feb 29 15:30:27 2012
@@ -3264,7 +3264,7 @@ deliver(const dav_resource *resource, ap
if (dirent->kind == svn_node_file && dirent->special)
{
svn_node_kind_t resolved_kind;
- const char *link_path =
+ const char *link_path =
svn_dirent_join(fs_parent_path, key, resource->pool);
serr = svn_io_check_resolved_path(link_path, &resolved_kind,
@@ -3277,7 +3277,7 @@ deliver(const dav_resource *resource, ap
resource->pool);
if (resolved_kind != svn_node_dir)
continue;
-
+
dirent->kind = svn_node_dir;
}
else if (dirent->kind != svn_node_dir)
Modified: subversion/trunk/subversion/svn/cat-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cat-cmd.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cat-cmd.c (original)
+++ subversion/trunk/subversion/svn/cat-cmd.c Wed Feb 29 15:30:27 2012
@@ -98,7 +98,7 @@ svn_cl__cat(apr_getopt_t *os,
if (status == SVN_ERR_ENTRY_NOT_FOUND ||
status == SVN_ERR_FS_NOT_FOUND)
- err = svn_error_quick_wrap(err,
+ err = svn_error_quick_wrap(err,
_("Could not cat all targets because "
"some targets don't exist"));
else if (status == SVN_ERR_UNVERSIONED_RESOURCE)
@@ -113,6 +113,6 @@ svn_cl__cat(apr_getopt_t *os,
return svn_error_trace(err);
}
-
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Feb 29 15:30:27 2012
@@ -2276,7 +2276,7 @@ main(int argc, const char *argv[])
/* Disallow simultaneous use of both -m and -F, when they are
both used to pass a commit message or lock comment. ('propset'
- takes the property value, not a commit message, from -F.)
+ takes the property value, not a commit message, from -F.)
*/
if (opt_state.filedata && opt_state.message
&& subcommand->cmd_func != svn_cl__propset)
Modified: subversion/trunk/subversion/svn/proplist-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/proplist-cmd.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/proplist-cmd.c (original)
+++ subversion/trunk/subversion/svn/proplist-cmd.c Wed Feb 29 15:30:27 2012
@@ -223,12 +223,12 @@ svn_cl__proplist(apr_getopt_t *os,
if (errors->nelts > 0)
{
svn_error_t *err;
-
+
err = svn_error_create(SVN_ERR_ILLEGAL_TARGET, NULL, NULL);
for (i = 0; i < errors->nelts; i++)
{
apr_status_t status = APR_ARRAY_IDX(errors, i, apr_status_t);
-
+
if (status == SVN_ERR_ENTRY_NOT_FOUND)
err = svn_error_quick_wrap(err,
_("Could not display properties "
Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Wed Feb 29 15:30:27 2012
@@ -130,10 +130,10 @@ generate_status_desc(enum svn_wc_status_
RELATIVE_TO_PATH and TARGET_PATH must be based on the same parent path,
i.e. they can either both be absolute or they can both be relative to the
same parent directory. Both paths are expected to be canonical.
-
+
If above conditions are met, a relative path that leads to TARGET_ABSPATH
from RELATIVE_TO_PATH is returned, but there is no error checking involved.
-
+
The returned path is allocated from RESULT_POOL, all other allocations are
made in SCRATCH_POOL. */
static const char *
@@ -148,7 +148,7 @@ make_relpath(const char *relative_to_pat
/* An example:
* relative_to_path = /a/b/c
* target_path = /a/x/y/z
- * result = ../../x/y/z
+ * result = ../../x/y/z
*
* Another example (Windows specific):
* relative_to_path = F:/wc
Modified: subversion/trunk/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Wed Feb 29 15:30:27 2012
@@ -363,7 +363,7 @@ static const svn_opt_subcommand_desc2_t
{'q', 'r', svnadmin__ignore_uuid, svnadmin__force_uuid,
svnadmin__use_pre_commit_hook, svnadmin__use_post_commit_hook,
svnadmin__parent_dir, svnadmin__bypass_prop_validation, 'M'} },
-
+
{"lock", subcommand_lock, {0}, N_
("usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n\n"
"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n"
@@ -1027,7 +1027,7 @@ subcommand_load(apr_getopt_t *os, void *
{
lower = upper;
}
-
+
/* Ensure correct range ordering. */
if (lower > upper)
{
@@ -1483,7 +1483,7 @@ subcommand_lock(apr_getopt_t *os, void *
lock_token = APR_ARRAY_IDX(args, 3, const char *);
SVN_ERR(target_arg_to_dirent(&comment_file_name, comment_file_name, pool));
-
+
SVN_ERR(open_repos(&repos, opt_state->repository_path, pool));
fs = svn_repos_fs(repos);
@@ -1496,10 +1496,10 @@ subcommand_lock(apr_getopt_t *os, void *
SVN_ERR(svn_stringbuf_from_file2(&file_contents, comment_file_name, pool));
SVN_ERR(svn_utf_cstring_to_utf8(&lock_path_utf8, lock_path, pool));
-
+
if (opt_state->bypass_hooks)
SVN_ERR(svn_fs_lock(&lock, fs, lock_path_utf8,
- lock_token,
+ lock_token,
file_contents->data, /* comment */
0, /* is_dav_comment */
0, /* no expiration time. */
@@ -1507,7 +1507,7 @@ subcommand_lock(apr_getopt_t *os, void *
FALSE, pool));
else
SVN_ERR(svn_repos_fs_lock(&lock, repos, lock_path_utf8,
- lock_token,
+ lock_token,
file_contents->data, /* comment */
0, /* is_dav_comment */
0, /* no expiration time. */
Modified: subversion/trunk/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/main.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/main.c (original)
+++ subversion/trunk/subversion/svnlook/main.c Wed Feb 29 15:30:27 2012
@@ -875,7 +875,7 @@ display_prop_diffs(const apr_array_heade
/* The last character in a property is often not a newline.
An eol character is appended to prevent the diff API to add a
- ' \ No newline at end of file' line. We add
+ ' \ No newline at end of file' line. We add
' \ No newline at end of property' manually if needed. */
tmp = orig_value ? orig_value : svn_string_create_empty(pool);
orig = maybe_append_eol(tmp, NULL, pool);
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Wed Feb 29 15:30:27 2012
@@ -181,7 +181,7 @@ get_props_content(svn_stringbuf_t **head
svn_stream_t *content_stream;
apr_hash_t *normal_props;
const char *buf;
-
+
*content = svn_stringbuf_create_empty(result_pool);
*header = svn_stringbuf_create_empty(result_pool);
@@ -932,7 +932,7 @@ fetch_base_func(const char **filename,
}
else if (err)
return svn_error_trace(err);
-
+
SVN_ERR(svn_stream_close(fstream));
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/svnversion/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnversion/main.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/svnversion/main.c (original)
+++ subversion/trunk/subversion/svnversion/main.c Wed Feb 29 15:30:27 2012
@@ -225,7 +225,7 @@ main(int argc, const char *argv[])
}
SVN_INT_ERR(svn_utf_cstring_to_utf8(&wc_path,
- (os->ind < argc) ? os->argv[os->ind]
+ (os->ind < argc) ? os->argv[os->ind]
: ".",
pool));
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Wed Feb 29 15:30:27 2012
@@ -1383,7 +1383,7 @@ def upgrade_absent(sbox):
# Relocate to allow finding the repository
svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
'svn://127.0.0.1/authz_tests-2',
- sbox.repo_url, sbox.wc_dir)
+ sbox.repo_url, sbox.wc_dir)
expected_output = svntest.wc.State(sbox.wc_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=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Wed Feb 29 15:30:27 2012
@@ -2898,17 +2898,17 @@ def rm_missing_with_case_clashing_ondisk
iota_path = os.path.join(wc_dir, 'iota')
IOTA_path = os.path.join(wc_dir, 'IOTA')
-
+
# Out-of-svn move, to make iota missing, while IOTA appears as unversioned.
os.rename(iota_path, IOTA_path)
-
+
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'iota' : Item(status='! ', wc_rev='1'),
'IOTA' : Item(status='? '),
})
svntest.actions.run_and_verify_unquiet_status(wc_dir, expected_status)
-
+
# 'svn rm' iota, should leave IOTA alone.
svntest.actions.run_and_verify_svn(None, None, [],
'rm', iota_path)
@@ -2934,7 +2934,7 @@ def delete_conflicts_one_of_many(sbox):
svntest.actions.run_and_verify_svn(None, None, [],
'update', '-r1', '--accept', 'postpone',
wc_dir)
-
+
if not os.path.exists(sbox.ospath('A/D/G/rho.mine')):
raise svntest.Failure("conflict file rho.mine missing")
Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Wed Feb 29 15:30:27 2012
@@ -1140,7 +1140,7 @@ def commit_in_dir_scheduled_for_addition
mu_path = os.path.join(wc_dir, 'Z', 'mu')
svntest.main.run_svn(None, 'move', A_path, Z_path)
-
+
# Make sure mu is a committable
svntest.main.file_write(mu_path, "xxxx")
@@ -1183,7 +1183,7 @@ def commit_in_dir_scheduled_for_addition
"svn: E200009: '" +
re.escape(Z_abspath) +
"' is not known to exist in the.*",
- R_path)
+ R_path)
#----------------------------------------------------------------------
@@ -2846,7 +2846,7 @@ def commit_incomplete(sbox):
expected_status,
None,
wc_dir)
-
+
#----------------------------------------------------------------------
# Reported here:
# Message-ID: <4E...@gmail.com>
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed Feb 29 15:30:27 2012
@@ -161,7 +161,7 @@ def make_diff_prop_val(plus_minus, pval)
if len(pval) > 0 and pval[-1] != '\n':
return [plus_minus + pval + "\n","\\ No newline at end of property\n"]
return [plus_minus + pval]
-
+
def make_diff_prop_deleted(pname, pval):
"""Return a property diff for deletion of property PNAME, old value PVAL.
PVAL is a single string with no embedded newlines. Return the result
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Wed Feb 29 15:30:27 2012
@@ -1923,7 +1923,7 @@ def file_externals_different_url(sbox):
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
actions.run_and_verify_info([{'Repository Root' : r1_url}],
os.path.join(sbox.wc_dir, e))
-
+
svntest.actions.run_and_verify_svn(None, None, [],
'relocate', r1_url, r2_url, wc_dir)
@@ -2554,10 +2554,10 @@ def include_immediate_dir_externals(sbox
# svn ps svn:externals "^/A/B/E X/XE" wc_dir
# svn ci
# svn up
- #
+ #
# svn ps some change X/XE
# echo mod >> X/XE/alpha
- #
+ #
# svn st X/XE
# # Expect only the propset on X/XE to be committed.
# # Should be like 'svn commit --include-externals --depth=empty X/XE'.
@@ -2808,7 +2808,7 @@ def url_to_wc_copy_of_externals(sbox):
# Previously this failed with:
# >svn copy ^^/A/C External-WC-to-URL-Copy
# U External-WC-to-URL-Copy
- #
+ #
# Fetching external item into 'External-WC-to-URL-Copy\external':
# A External-WC-to-URL-Copy\external\pi
# A External-WC-to-URL-Copy\external\rho
Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Wed Feb 29 15:30:27 2012
@@ -469,7 +469,7 @@ def info_show_exclude(sbox):
sbox.simple_rm('iota')
sbox.simple_commit()
-
+
expected_error = 'svn: E200009: Could not display info for all targets.*'
# Expect error on iota (status = not-present)
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Wed Feb 29 15:30:27 2012
@@ -443,7 +443,7 @@ def mergeinfo_and_skipped_paths(sbox):
# and skipped). 'A_COPY_2/D/H/zeta' must therefore get its own explicit
# mergeinfo from this merge.
svntest.actions.run_and_verify_svn(None, None, [], 'revert', '--recursive',
- wc_restricted)
+ wc_restricted)
expected_output = wc.State(A_COPY_2_H_path, {
'omega' : Item(status='U '),
'zeta' : Item(status='A '),
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Feb 29 15:30:27 2012
@@ -2430,7 +2430,7 @@ def reintegrate_replaced_source(sbox):
A_path = os.path.join(sbox.wc_dir, "A")
A_COPY_path = os.path.join(sbox.wc_dir, "A_COPY")
beta_COPY_path = os.path.join(sbox.wc_dir, "A_COPY", "B", "E", "beta")
- mu_COPY_path = os.path.join(sbox.wc_dir, "A_COPY", "mu")
+ mu_COPY_path = os.path.join(sbox.wc_dir, "A_COPY", "mu")
# Using cherrypick merges, simulate a series of sync merges from A to
# A_COPY with a replace of A_COPY along the way.
@@ -2470,7 +2470,7 @@ def reintegrate_replaced_source(sbox):
wc_dir)
# r12 - Do a final sync merge of A to A_COPY in preparation for
- # reintegration.
+ # reintegration.
svntest.main.run_svn(None, 'up', wc_dir)
svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', A_COPY_path)
svntest.main.run_svn(None, 'ci', '-m', 'Sycn A_COPY with A', wc_dir)
@@ -2541,7 +2541,7 @@ def reintegrate_replaced_source(sbox):
expected_skip,
[], None, None, None, None, True, True,
'--reintegrate', A_path)
-
+
#----------------------------------------------------------------------
@SkipUnless(svntest.main.is_posix_os)
@Issue(4052)
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Feb 29 15:30:27 2012
@@ -17018,7 +17018,7 @@ def merged_deletion_causes_tree_conflict
'-m', 'Copy ^/A to ^/branch')
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
- # r4 - Delete A/D/H/psi
+ # r4 - Delete A/D/H/psi
svntest.actions.run_and_verify_svn(None, None, [], 'delete', psi_path)
svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
'Delete a a path with native eol-style',
@@ -17213,7 +17213,7 @@ def unnecessary_noninheritable_mergeinfo
B_branch_path = os.path.join(sbox.wc_dir, 'branch', 'B')
- # Setup a simple branch to which
+ # Setup a simple branch to which
expected_output, expected_mergeinfo_output, expected_elision_output, \
expected_status, expected_disk, expected_skip = \
noninheritable_mergeinfo_test_set_up(sbox)
@@ -17258,7 +17258,7 @@ def unnecessary_noninheritable_mergeinfo
B_branch_path = os.path.join(sbox.wc_dir, 'branch', 'B')
E_path = os.path.join(sbox.wc_dir, 'A', 'B', 'E')
- # Setup a simple branch to which
+ # Setup a simple branch to which
expected_output, expected_mergeinfo_output, expected_elision_output, \
expected_status, expected_disk, expected_skip = \
noninheritable_mergeinfo_test_set_up(sbox)
@@ -17316,7 +17316,7 @@ def unnecessary_noninheritable_mergeinfo
# /A/B:4* <-- Should be inheritable
# Properties on 'branch\B\E':
# svn:mergeinfo
- # /A/B/E:4 <-- Not necessary
+ # /A/B/E:4 <-- Not necessary
expected_output = wc.State(B_branch_path, {
'E' : Item(status=' U'),
})
Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Wed Feb 29 15:30:27 2012
@@ -532,7 +532,7 @@ def wc_target_inherits_mergeinfo_from_re
gamma_2_path = os.path.join(wc_dir, 'A_COPY_2', 'D', 'gamma')
tau_path = os.path.join(wc_dir, 'A', 'D', 'G', 'tau')
D_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D')
-
+
# Merge -c5 ^/A/D/G/rho A_COPY\D\G\rho
# Merge -c7 ^/A A_COPY
# Commit as r8
@@ -565,7 +565,7 @@ def wc_target_inherits_mergeinfo_from_re
# Check the merged and eligible revisions both recursively and
# non-recursively.
- # Eligible : Non-recursive
+ # Eligible : Non-recursive
svntest.actions.run_and_verify_mergeinfo(
adjust_error_for_server_version(''),
['4','5'], sbox.repo_url + '/A/D', subtree_wc,
@@ -618,7 +618,7 @@ def wc_target_inherits_mergeinfo_from_re
svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
'Merge r8 from A_COPY_2 to A_COPY',
wc_dir)
-
+
def test_svn_mergeinfo_4_way(wc_target):
# Eligible : Non-recursive
svntest.actions.run_and_verify_mergeinfo(
@@ -738,7 +738,7 @@ def noninheritabled_mergeinfo_not_always
# unconditionally set for merges with shallow operational depths.
svntest.actions.run_and_verify_svn(None, None, [],
'propset', SVN_PROP_MERGEINFO,
- '/A:3*\n', branch_path)
+ '/A:3*\n', branch_path)
svntest.main.run_svn(None, 'commit', '-m', 'shallow merge', wc_dir)
# Now check that r3 is reported as fully merged from ^/A to ^/branch
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Wed Feb 29 15:30:27 2012
@@ -3727,7 +3727,7 @@ def patch_deletes_prop(sbox):
# *adds* the property.
svntest.main.run_svn(None, 'revert', iota_path)
- # Apply patch
+ # Apply patch
unidiff_patch = [
"Index: iota\n",
"===================================================================\n",
@@ -3750,7 +3750,7 @@ def patch_deletes_prop(sbox):
None, # expected err
1, # check-props
1, # dry-run
- '--reverse-diff')
+ '--reverse-diff')
@Issue(4004)
def patch_reversed_add_with_props(sbox):
@@ -3799,7 +3799,7 @@ def patch_reversed_add_with_props(sbox):
None, # expected err
1, # check-props
1, # dry-run
- '--reverse-diff')
+ '--reverse-diff')
@Issue(4004)
def patch_reversed_add_with_props2(sbox):
@@ -3854,7 +3854,7 @@ def patch_reversed_add_with_props2(sbox)
None, # expected err
1, # check-props
1, # dry-run
- '--reverse-diff')
+ '--reverse-diff')
def patch_dev_null(sbox):
"patch with /dev/null filenames"
Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Wed Feb 29 15:30:27 2012
@@ -998,7 +998,7 @@ def replace_symlinks(sbox):
os.symlink('../iota', wc('A/mu.sh'))
sbox.simple_add('A/mu',
'A/mu.sh')
-
+
# Ditto, without the Subversion replacement. Failing git-svn test
# 'executable file becomes a symlink to bar/zzz (file)'.
os.remove(wc('Ax/mu'))
@@ -1009,7 +1009,7 @@ def replace_symlinks(sbox):
'Ax/mu',
'Ax/mu.sh')
sbox.simple_propdel('svn:executable', 'Ax/mu.sh')
-
+
### TODO Replace a normal {file, exec, dir, dir} with a symlink to
### {dir, dir, file, exec}. And the same symlink-to-normal.
@@ -1052,7 +1052,7 @@ def externals_as_symlink_targets(sbox):
sbox.simple_add('sym_ext_E')
sbox.simple_commit()
-
+
@XFail()
@Issue(4119)
@SkipUnless(svntest.main.is_posix_os)
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Wed Feb 29 15:30:27 2012
@@ -936,7 +936,7 @@ def status_in_xml(sbox):
'cp', '-m', 'repo-to-repo copy',
sbox.repo_url + '/iota',
sbox.repo_url + '/iota2')
-
+
file_path = sbox.ospath('iota2')
expected_entries = {file_path : {'wcprops' : 'none',
@@ -1925,7 +1925,7 @@ def status_not_present(sbox):
svntest.main.run_svn(None, 'up', '--set-depth', 'exclude',
sbox.ospath('A/mu'), sbox.ospath('A/B'))
sbox.simple_commit()
-
+
svntest.actions.run_and_verify_svn(None, [], [],'status',
sbox.ospath('iota'),
sbox.ospath('A/B'),
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Wed Feb 29 15:30:27 2012
@@ -111,10 +111,10 @@ def check_hotcopy_fsfs(src, dst):
# both at EOF
break
elif buf1:
- raise svntest.Failure("%s differs at offset %i" %
+ raise svntest.Failure("%s differs at offset %i" %
(dst_path, offset))
elif buf2:
- raise svntest.Failure("%s differs at offset %i" %
+ raise svntest.Failure("%s differs at offset %i" %
(dst_path, offset))
if len(buf1) != len(buf2):
raise svntest.Failure("%s differs in length" % dst_path)
@@ -1466,7 +1466,7 @@ def verify_non_utf8_paths(sbox):
def test_lslocks_and_rmlocks(sbox):
"test 'svnadmin lslocks' and 'svnadmin rmlocks'"
-
+
sbox.build(create_wc=False)
iota_url = sbox.repo_url + '/iota'
lambda_url = sbox.repo_url + '/A/B/lambda'
@@ -1480,7 +1480,7 @@ def test_lslocks_and_rmlocks(sbox):
expected_output = UnorderedOutput(
["'A/B/lambda' locked by user 'jrandom'.\n",
"'iota' locked by user 'jrandom'.\n"])
-
+
# Lock iota and A/B/lambda using svn client
svntest.actions.run_and_verify_svn(None, expected_output,
[], "lock", "-m", "Locking files",
@@ -1495,18 +1495,18 @@ def test_lslocks_and_rmlocks(sbox):
"Comment \(1 line\):",
"Locking files",
"Path: /iota",
- "UUID Token: opaquelocktoken.*",
- "\n", # empty line
+ "UUID Token: opaquelocktoken.*",
+ "\n", # empty line
]
# List all locks
exit_code, output, errput = svntest.main.run_svnadmin("lslocks",
sbox.repo_dir)
-
+
if errput:
raise SVNUnexpectedStderr(errput)
svntest.verify.verify_exit_code(None, exit_code, 0)
-
+
try:
expected_output = svntest.verify.UnorderedRegexOutput(expected_output_list)
svntest.verify.compare_and_display_lines('lslocks output mismatch',
@@ -1540,7 +1540,7 @@ def test_lslocks_and_rmlocks(sbox):
"Expires:",
"Comment \(1 line\):",
"Locking files",
- "\n", # empty line
+ "\n", # empty line
])
svntest.verify.compare_and_display_lines('message', 'label',
@@ -1554,7 +1554,7 @@ def test_lslocks_and_rmlocks(sbox):
"A/B/lambda")
expected_output = UnorderedOutput(["Removed lock on '/iota'.\n",
"Removed lock on '/A/B/lambda'.\n"])
-
+
svntest.verify.verify_outputs(
"Unexpected output while running 'svnadmin rmlocks'.",
output, [], expected_output, None)
@@ -1652,7 +1652,7 @@ def hotcopy_incremental_packed(sbox):
def locking(sbox):
"svnadmin lock tests"
sbox.build(create_wc=False)
-
+
comment_path = os.path.join(svntest.main.temp_dir, "comment")
svntest.main.file_write(comment_path, "dummy comment")
@@ -1662,15 +1662,15 @@ def locking(sbox):
# Test illegal character in comment file.
expected_error = ".*svnadmin: E130004:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
- expected_error, "lock",
+ expected_error, "lock",
sbox.repo_dir,
"iota", "jrandom",
invalid_comment_path)
-
+
# Test locking path with --bypass-hooks
expected_output = "'iota' locked by user 'jrandom'."
svntest.actions.run_and_verify_svnadmin(None, expected_output,
- None, "lock",
+ None, "lock",
sbox.repo_dir,
"iota", "jrandom",
comment_path,
@@ -1678,13 +1678,13 @@ def locking(sbox):
# Remove lock
svntest.actions.run_and_verify_svnadmin(None, None,
- None, "rmlocks",
+ None, "rmlocks",
sbox.repo_dir, "iota")
-
+
# Test locking path without --bypass-hooks
expected_output = "'iota' locked by user 'jrandom'."
svntest.actions.run_and_verify_svnadmin(None, expected_output,
- None, "lock",
+ None, "lock",
sbox.repo_dir,
"iota", "jrandom",
comment_path)
@@ -1692,7 +1692,7 @@ def locking(sbox):
# Test locking already locked path.
expected_error = ".*svnadmin: E160035:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
- expected_error, "lock",
+ expected_error, "lock",
sbox.repo_dir,
"iota", "jrandom",
comment_path)
@@ -1700,7 +1700,7 @@ def locking(sbox):
# Test locking non-existent path.
expected_error = ".*svnadmin: E160013:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
- expected_error, "lock",
+ expected_error, "lock",
sbox.repo_dir,
"non-existent", "jrandom",
comment_path)
@@ -1709,7 +1709,7 @@ def locking(sbox):
expected_output = "'A/D/G/rho' locked by user 'jrandom'."
lock_token = "opaquelocktoken:01234567-89ab-cdef-89ab-cdef01234567"
svntest.actions.run_and_verify_svnadmin(None, expected_output,
- None, "lock",
+ None, "lock",
sbox.repo_dir,
"A/D/G/rho", "jrandom",
comment_path, lock_token)
@@ -1718,11 +1718,11 @@ def locking(sbox):
expected_error = ".*svnadmin: E160040:.*"
wrong_lock_token = "opaquelocktoken:12345670-9ab8-defc-9ab8-def01234567c"
svntest.actions.run_and_verify_svnadmin(None, None,
- expected_error, "unlock",
+ expected_error, "unlock",
sbox.repo_dir,
"A/D/G/rho", "jrandom",
wrong_lock_token)
-
+
# Test unlocking the path again, but this time provide the correct
# lock token.
expected_output = "'A/D/G/rho' unlocked."
@@ -1737,12 +1737,12 @@ def locking(sbox):
svntest.main.create_python_hook_script(hook_path, 'import sys; sys.exit(1)')
hook_path = svntest.main.get_pre_unlock_hook_path(sbox.repo_dir)
svntest.main.create_python_hook_script(hook_path, 'import sys; sys.exit(1)')
-
+
# Test locking a path. Don't use --bypass-hooks, though, as we wish
# to verify that hook script is really getting executed.
expected_error = ".*svnadmin: E165001:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
- expected_error, "lock",
+ expected_error, "lock",
sbox.repo_dir,
"iota", "jrandom",
comment_path)
@@ -1764,7 +1764,7 @@ def locking(sbox):
# with a preventative hook in place.
expected_error = ".*svnadmin: E165001:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
- expected_error, "unlock",
+ expected_error, "unlock",
sbox.repo_dir,
"iota", "jrandom",
iota_token)
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Wed Feb 29 15:30:27 2012
@@ -142,7 +142,7 @@ def run_dump_test(sbox, dumpfile_name, e
svntest.verify.compare_and_display_lines(
"Dump files", "DUMP", svnadmin_dumpfile, svnrdump_dumpfile,
None, mismatched_headers_re)
-
+
else:
compare_repos_dumps(sbox, svnadmin_dumpfile)
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests.py Wed Feb 29 15:30:27 2012
@@ -251,7 +251,7 @@ or another dump file."""
# file.
if exp_dump_file_name:
build_repos(sbox)
- svntest.actions.run_and_verify_load(sbox.repo_dir,
+ svntest.actions.run_and_verify_load(sbox.repo_dir,
open(os.path.join(svnsync_tests_dir,
exp_dump_file_name),
'rb').readlines())
@@ -1007,7 +1007,7 @@ def copy_delete_unreadable_child(sbox):
# Prepare the source: Greek tree (r1), cp+rm (r2).
sbox.build("copy-delete-unreadable-child")
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, None, [],
'-m', 'r2',
'-U', sbox.repo_url,
'cp', 'HEAD', '/', 'branch',
@@ -1034,7 +1034,7 @@ def copy_delete_unreadable_child(sbox):
run_sync(dest_url)
# sanity check
- svntest.actions.run_and_verify_svn(None,
+ svntest.actions.run_and_verify_svn(None,
["iota\n"], [],
'ls', dest_url+'/branch@2')
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Wed Feb 29 15:30:27 2012
@@ -359,7 +359,7 @@ def update_binary_file_3(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
- # Now we locally modify the file back to the old version.
+ # Now we locally modify the file back to the old version.
svntest.main.file_write(theta_path, theta_contents, 'wb')
# Create expected output tree for an update to rev 2.
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Feb 29 15:30:27 2012
@@ -83,7 +83,7 @@ def replace_sbox_repo_with_tarfile(sbox,
if not dir:
dir = tar_filename.split('.')[0]
-
+
tarpath = os.path.join(os.path.dirname(sys.argv[0]), 'upgrade_tests_data',
tar_filename)
t = tarfile.open(tarpath, 'r:bz2')
@@ -1163,7 +1163,7 @@ def upgrade_file_externals(sbox):
svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
'file:///tmp/repo', sbox.repo_url,
sbox.wc_dir)
-
+
expected_output = svntest.wc.State(sbox.wc_dir, {
'A/mu' : Item(status=' U'),
'A/B/lambda' : Item(status=' U'),
Modified: subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c Wed Feb 29 15:30:27 2012
@@ -112,7 +112,7 @@ test_spillbuf_callback(apr_pool_t *pool)
SVN_ERR(svn_spillbuf__process(&exhausted, buf, read_callback, &counter,
pool));
SVN_TEST_ASSERT(!exhausted);
-
+
SVN_ERR(svn_spillbuf__process(&exhausted, buf, read_callback, &counter,
pool));
SVN_TEST_ASSERT(exhausted);
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Feb 29 15:30:27 2012
@@ -350,12 +350,12 @@ print_row(const nodes_row_t *row,
moved_here_str = ", here";
else
moved_here_str = "";
-
+
if (row->file_external)
file_external_str = ", file-external";
else
file_external_str = "";
-
+
if (row->repo_revnum == SVN_INVALID_REVNUM)
return apr_psprintf(result_pool, "%d, %s, %s%s%s%s",
row->op_depth, row->local_relpath, row->presence,
@@ -3727,7 +3727,7 @@ incomplete_switch(const svn_test_opts_t
{0}
};
- nodes_row_t after_update[] = {
+ nodes_row_t after_update[] = {
{0, "", "normal", 4, "X"},
{0, "B", "normal", 4, "A/B"},
{0, "B/C", "normal", 4, "A/B/C"},
@@ -4195,7 +4195,7 @@ move_to_swap(const svn_test_opts_t *opts
SVN_ERR(wc_move(&b, "A/Y", "X/Y"));
SVN_ERR(wc_move(&b, "X/B", "A/B"));
-
+
{
nodes_row_t nodes[] = {
{0, "", "normal", 1, ""},
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c Wed Feb 29 15:30:27 2012
@@ -78,7 +78,7 @@ int main(int argc, const char *argv[])
"Mark WCPATH incomplete at REVISION [and REPOS_RELPATH]\n");
exit(EXIT_FAILURE);
}
-
+
if (apr_initialize())
{
fprintf(stderr, "apr_initialize failed\n");
Modified: subversion/trunk/tools/client-side/detach.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/detach.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/detach.py (original)
+++ subversion/trunk/tools/client-side/detach.py Wed Feb 29 15:30:27 2012
@@ -67,7 +67,7 @@ def migrate_sqlite(wc_src, target, wcro
src_c.execute('select count(*) from wc_lock')
count = int(src_c.fetchone()[0])
assert count == 0
-
+
src_c.execute('select count(*) from work_queue')
count = int(src_c.fetchone()[0])
assert count == 0
Modified: subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/mergeinfo-sanitizer.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/mergeinfo-sanitizer.py (original)
+++ subversion/trunk/tools/client-side/mergeinfo-sanitizer.py Wed Feb 29 15:30:27 2012
@@ -177,7 +177,7 @@ def sanitize_mergeinfo(parsed_original_m
for entry in parsed_original_mergeinfo:
get_new_location_segments(parsed_original_mergeinfo[entry], repo_root, wcpath, ctx)
full_mergeinfo.update(parsed_original_mergeinfo[entry])
-
+
hasher(hash_file, newmergeinfo_file)
diff_mergeinfo = core.svn_mergeinfo_diff(full_mergeinfo,
mergeinfo, 1, temp_pool)
@@ -200,7 +200,7 @@ def fix_sanitized_mergeinfo(parsed_origi
ctx, hash_file, newmergeinfo_file, temp_pool):
has_local_modification = check_local_modifications(wcpath, temp_pool)
old_hash = ''
- new_hash = ''
+ new_hash = ''
try:
with open(hash_file, "r") as f:
old_hash = pickle.load(f)
@@ -248,7 +248,7 @@ the working copy before running the scri
sys.exit(1)
def get_original_mergeinfo(wcpath, revision, depth, ctx, temp_pool):
- propget_list = client.svn_client_propget3("svn:mergeinfo", wcpath,
+ propget_list = client.svn_client_propget3("svn:mergeinfo", wcpath,
revision, revision, depth, None,
ctx, temp_pool)
Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Feb 29 15:30:27 2012
@@ -396,9 +396,9 @@ def roll_tarballs(args):
raise RuntimeError('Cannot find usable %s' % dep.label)
if branch != 'trunk':
- # Make sure CHANGES is sync'd.
+ # Make sure CHANGES is sync'd.
compare_changes(repos, branch, args.revnum)
-
+
# Ensure the output directory doesn't already exist
if os.path.exists(get_deploydir(args.base_dir)):
raise RuntimeError('output directory \'%s\' already exists'
Modified: subversion/trunk/tools/server-side/svnpredumpfilter.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpredumpfilter.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpredumpfilter.py (original)
+++ subversion/trunk/tools/server-side/svnpredumpfilter.py Wed Feb 29 15:30:27 2012
@@ -114,12 +114,12 @@ def log(msg, min_verbosity):
elif min_verbosity == 2:
sys.stderr.write("[**] ")
sys.stderr.write(msg + "\n")
-
+
class DependencyTracker:
def __init__(self, include_paths):
self.include_paths = include_paths[:]
self.dependent_paths = []
-
+
def path_included(self, path):
for include_path in self.include_paths + self.dependent_paths:
if subsumes(include_path, path):
@@ -143,7 +143,7 @@ def readline(stream):
def svn_log_stream_get_dependencies(stream, included_paths):
import re
- dt = DependencyTracker(included_paths)
+ dt = DependencyTracker(included_paths)
header_re = re.compile(r'^r([0-9]+) \|.*$')
action_re = re.compile(r'^ [ADMR] /(.*)$')
@@ -153,7 +153,7 @@ def svn_log_stream_get_dependencies(stre
eof = False
path_copies = {}
found_changed_path = False
-
+
while not eof:
try:
line = line_buf is not None and line_buf or readline(stream)
@@ -220,7 +220,7 @@ def svn_log_stream_get_dependencies(stre
raise LogStreamError("No changed paths found; did you remember to run "
"'svn log' with the --verbose (-v) option when "
"generating the input to this script?")
-
+
return dt
def analyze_logs(included_paths):
@@ -268,13 +268,13 @@ def usage_and_exit(errmsg=None):
def main():
config_dir = None
targets_file = None
-
+
try:
opts, args = getopt.getopt(sys.argv[1:], "hv",
["help", "verbose", "targets="])
except getopt.GetoptError, e:
usage_and_exit(str(e))
-
+
for option, value in opts:
if option in ['-h', '--help']:
usage_and_exit()
Modified: subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py Wed Feb 29 15:30:27 2012
@@ -37,7 +37,7 @@
# URL is built into 3 parts:
# /${type}/${optional_repo_uuid}/${format}
#
-# If the repository UUID is included in the URl, you will only receive
+# If the repository UUID is included in the URl, you will only receive
# messages about that repository.
#
# Example Pub clients:
@@ -88,7 +88,7 @@ class Revision:
'author': self.author,
'log': self.log,
'date': self.date}}) +","
- elif format == "xml":
+ elif format == "xml":
c = ET.Element('commit', {'repository': self.repos, 'revision': "%d" % (self.rev)})
ET.SubElement(c, 'author').text = self.author
ET.SubElement(c, 'date').text = self.date
@@ -107,7 +107,7 @@ class Revision:
return json.dumps({'commit': {'repository': self.repos,
'revision': self.rev,
'dirs_changed': self.dirs_changed}}) +","
- elif format == "xml":
+ elif format == "xml":
c = ET.Element('commit', {'repository': self.repos, 'revision': "%d" % (self.rev)})
d = ET.SubElement(c, 'dirs_changed')
for p in self.dirs_changed:
@@ -133,7 +133,7 @@ class Client(object):
def finished(self, reason):
self.alive = False
log.msg("CLOSE: %s:%d (%d clients online)"% (self.r.getClientIP(), self.r.client.port, self.pubsub.cc()))
- try:
+ try:
self.pubsub.remove(self)
except ValueError:
pass
@@ -210,11 +210,11 @@ class SvnPubSub(resource.Resource):
else:
fmt = uri[3]
uuid = uri[2]
-
+
if type not in self.clients.keys():
request.setResponseCode(400)
return "Invalid Reuqest Type\n"
-
+
clients = {'json': JSONClient, 'xml': XMLClient}
clientCls = clients.get(fmt)
if clientCls == None:
@@ -262,7 +262,7 @@ def svnpubsub_server():
root.putChild("commits", s)
root.putChild("commit", s)
return server.Site(root)
-
+
if __name__ == "__main__":
log.startLogging(sys.stdout)
# Port 2069 "HTTP Event Port", whatever, sounds good to me
Modified: subversion/trunk/tools/server-side/svnpubsub/svntweet.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svntweet.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/svntweet.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svntweet.py Wed Feb 29 15:30:27 2012
@@ -21,7 +21,7 @@
#
# Example:
# svntweet.py my-config.json
-#
+#
# With my-config.json containing stream paths and the twitter auth info:
# {"stream": "http://svn-master.apache.org:2069/commits/xml",
# "username": "asfcommits",
@@ -90,9 +90,9 @@ class Revision:
self.log = None
self.date = None
-class StreamHandler(handler.ContentHandler):
+class StreamHandler(handler.ContentHandler):
def __init__(self, bdec):
- handler.ContentHandler.__init__(self)
+ handler.ContentHandler.__init__(self)
self.bdec = bdec
self.rev = None
self.text_value = None
@@ -115,7 +115,7 @@ class StreamHandler(handler.ContentHandl
self.bdec.stillalive()
def characters(self, data):
if self.text_value is not None:
- self.text_value = self.text_value + data
+ self.text_value = self.text_value + data
else:
self.text_value = data
@@ -179,7 +179,7 @@ class BigDoEverythingClasss(object):
def pageStart(self):
log.msg("Stream Connection Established")
self.failures = 0
-
+
def _restartStream(self):
(self.stream, self.transport) = connectTo(self.url, self)
self.stream.deferred.addBoth(self.streamDead)
@@ -253,6 +253,6 @@ def main(config_file):
if __name__ == "__main__":
if len(sys.argv) != 2:
print "invalid args, read source code"
- sys.exit(0)
+ sys.exit(0)
log.startLogging(sys.stdout)
main(sys.argv[1])
Modified: subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnwcsub.py Wed Feb 29 15:30:27 2012
@@ -130,7 +130,7 @@ class WorkingCopy(object):
uuid = info['Repository UUID']
relpath = url[len(repos):] # also has leading '/'
return [relpath, url, repos, uuid]
-
+
class HTTPStream(HTTPClientFactory):
protocol = HTTPPageDownloader
@@ -154,9 +154,9 @@ class Revision:
self.rev = rev
self.dirs_changed = []
-class StreamHandler(handler.ContentHandler):
+class StreamHandler(handler.ContentHandler):
def __init__(self, stream, bdec):
- handler.ContentHandler.__init__(self)
+ handler.ContentHandler.__init__(self)
self.stream = stream
self.bdec = bdec
self.rev = None
@@ -167,7 +167,7 @@ class StreamHandler(handler.ContentHandl
"""
<commit revision="7">
<dirs_changed><path>/</path></dirs_changed>
- </commit>
+ </commit>
"""
if name == "commit":
self.rev = Revision(attrs['repository'], int(attrs['revision']))
@@ -175,7 +175,7 @@ class StreamHandler(handler.ContentHandl
self.bdec.stillalive(self.stream)
def characters(self, data):
if self.text_value is not None:
- self.text_value = self.text_value + data
+ self.text_value = self.text_value + data
else:
self.text_value = data
Modified: subversion/trunk/tools/server-side/svnpubsub/watcher.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/watcher.py?rev=1295152&r1=1295151&r2=1295152&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/watcher.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/watcher.py Wed Feb 29 15:30:27 2012
@@ -53,5 +53,5 @@ def main(config_file):
if __name__ == "__main__":
if len(sys.argv) != 2:
print "invalid args, read source code"
- sys.exit(0)
+ sys.exit(0)
main(sys.argv[1])