Greg Stein <gstein_at_gmail.com> writes:
> On Jun 28, 2011 5:55 AM, <stsp_at_apache.org> wrote:
>>
>> Author: stsp
>> Date: Tue Jun 28 09:55:04 2011
>> New Revision: 1140505
>>
>> URL: http://svn.apache.org/viewvc?rev=1140505&view=rev
>> Log:
>> stats++
>> * subversion/libsvn_subr/io.c
>> (svn_io_get_dir_filenames, temp_file_create): Fix indentation
> fallout from
>> the svn_error_return() -> svn_error_trace() rename. (Why didn't
> we call it
>> svn_error_traced()?)
>
I found some more and here is the patch.
Log
[[[
Followup to r1140505. Fix indentation.
* [everywhere]: Fix indentation fallout from the
svn_error_return() -> svn_error_trace() rename.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
Found by: stsp
]]]
Thanks and Regards
Noorul
Index: subversion/libsvn_diff/parse-diff.c
===================================================================
--- subversion/libsvn_diff/parse-diff.c (revision 1140505)
+++ subversion/libsvn_diff/parse-diff.c (working copy)
@@ -1394,5 +1394,5 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_io_file_close(patch_file->apr_file,
- scratch_pool));
+ scratch_pool));
}
Index: subversion/libsvn_fs/fs-loader.c
===================================================================
--- subversion/libsvn_fs/fs-loader.c (revision 1140505)
+++ subversion/libsvn_fs/fs-loader.c (working copy)
@@ -603,7 +603,7 @@
svn_boolean_t clean_logs, apr_pool_t *pool)
{
return svn_error_trace(svn_fs_hotcopy(src_path, dest_path, clean_logs,
- pool));
+ pool));
}
svn_error_t *
@@ -629,7 +629,7 @@
SVN_ERR(fs_library_vtable(&vtable, path, pool));
return svn_error_trace(vtable->bdb_logfiles(logfiles, path, only_unused,
- pool));
+ pool));
}
@@ -863,7 +863,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->node_history(history_p, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -900,7 +900,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->node_created_rev(revision, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -908,7 +908,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->node_origin_rev(revision, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -916,7 +916,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->node_created_path(created_path, root,
- path, pool));
+ path, pool));
}
svn_error_t *
@@ -924,7 +924,7 @@
const char *path, const char *propname, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->node_prop(value_p, root, path,
- propname, pool));
+ propname, pool));
}
svn_error_t *
@@ -932,7 +932,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->node_proplist(table_p, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -941,7 +941,7 @@
apr_pool_t *pool)
{
return svn_error_trace(root->vtable->change_node_prop(root, path, name,
- value, pool));
+ value, pool));
}
svn_error_t *
@@ -950,9 +950,9 @@
const char *path2, apr_pool_t *pool)
{
return svn_error_trace(root1->vtable->props_changed(changed_p,
- root1, path1,
- root2, path2,
- pool));
+ root1, path1,
+ root2, path2,
+ pool));
}
svn_error_t *
@@ -960,7 +960,7 @@
svn_fs_root_t *root, const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->copied_from(rev_p, path_p, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -968,7 +968,7 @@
svn_fs_root_t *root, const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->closest_copy(root_p, path_p,
- root, path, pool));
+ root, path, pool));
}
svn_error_t *
@@ -981,10 +981,10 @@
apr_pool_t *pool)
{
return svn_error_trace(root->vtable->get_mergeinfo(catalog, root, paths,
- inherit,
- validate_inherited_mergeinfo,
- include_descendants,
- pool));
+ inherit,
+ validate_inherited_mergeinfo,
+ include_descendants,
+ pool));
}
svn_error_t *
@@ -996,10 +996,10 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_fs_get_mergeinfo2(catalog, root, paths,
- inherit,
- FALSE,
- include_descendants,
- pool));
+ inherit,
+ FALSE,
+ include_descendants,
+ pool));
}
svn_error_t *
@@ -1010,9 +1010,9 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(fs->vtable->validate_mergeinfo(validated_mergeinfo,
- fs, mergeinfo,
- result_pool,
- scratch_pool));
+ fs, mergeinfo,
+ result_pool,
+ scratch_pool));
}
svn_error_t *
@@ -1022,10 +1022,10 @@
const char *ancestor_path, apr_pool_t *pool)
{
return svn_error_trace(target_root->vtable->merge(conflict_p,
- source_root, source_path,
- target_root, target_path,
- ancestor_root,
- ancestor_path, pool));
+ source_root, source_path,
+ target_root, target_path,
+ ancestor_root,
+ ancestor_path, pool));
}
svn_error_t *
@@ -1033,7 +1033,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->dir_entries(entries_p, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -1055,7 +1055,7 @@
{
SVN_ERR(svn_fs__path_valid(to_path, pool));
return svn_error_trace(to_root->vtable->copy(from_root, from_path,
- to_root, to_path, pool));
+ to_root, to_path, pool));
}
svn_error_t *
@@ -1063,7 +1063,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(to_root->vtable->revision_link(from_root, to_root,
- path, pool));
+ path, pool));
}
svn_error_t *
@@ -1071,7 +1071,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->file_length(length_p, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -1120,7 +1120,7 @@
const char *path, apr_pool_t *pool)
{
return svn_error_trace(root->vtable->file_contents(contents, root, path,
- pool));
+ pool));
}
svn_error_t *
@@ -1146,12 +1146,12 @@
pool));
return svn_error_trace(root->vtable->apply_textdelta(contents_p,
- contents_baton_p,
- root,
- path,
- base,
- result,
- pool));
+ contents_baton_p,
+ root,
+ path,
+ base,
+ result,
+ pool));
}
svn_error_t *
@@ -1167,7 +1167,7 @@
pool));
return svn_error_trace(root->vtable->apply_text(contents_p, root, path,
- result, pool));
+ result, pool));
}
svn_error_t *
@@ -1176,9 +1176,9 @@
const char *path2, apr_pool_t *pool)
{
return svn_error_trace(root1->vtable->contents_changed(changed_p,
- root1, path1,
- root2, path2,
- pool));
+ root1, path1,
+ root2, path2,
+ pool));
}
svn_error_t *
@@ -1198,7 +1198,7 @@
const char *propname, apr_pool_t *pool)
{
return svn_error_trace(fs->vtable->revision_prop(value_p, fs, rev,
- propname, pool));
+ propname, pool));
}
svn_error_t *
@@ -1206,7 +1206,7 @@
apr_pool_t *pool)
{
return svn_error_trace(fs->vtable->revision_proplist(table_p, fs, rev,
- pool));
+ pool));
}
svn_error_t *
@@ -1215,8 +1215,8 @@
const svn_string_t *value, apr_pool_t *pool)
{
return svn_error_trace(fs->vtable->change_rev_prop(fs, rev, name,
- old_value_p,
- value, pool));
+ old_value_p,
+ value, pool));
}
svn_error_t *
@@ -1235,9 +1235,9 @@
const char *target_path, apr_pool_t *pool)
{
return svn_error_trace(target_root->vtable->get_file_delta_stream(
- stream_p,
- source_root, source_path,
- target_root, target_path, pool));
+ stream_p,
+ source_root, source_path,
+ target_root, target_path, pool));
}
svn_error_t *
@@ -1286,8 +1286,8 @@
_("Negative expiration date passed to svn_fs_lock"));
return svn_error_trace(fs->vtable->lock(lock, fs, path, token, comment,
- is_dav_comment, expiration_date,
- current_rev, steal_lock, pool));
+ is_dav_comment, expiration_date,
+ current_rev, steal_lock, pool));
}
svn_error_t *
@@ -1301,7 +1301,7 @@
svn_boolean_t break_lock, apr_pool_t *pool)
{
return svn_error_trace(fs->vtable->unlock(fs, path, token, break_lock,
- pool));
+ pool));
}
svn_error_t *
@@ -1321,8 +1321,8 @@
(depth == svn_depth_immediates) ||
(depth == svn_depth_infinity));
return svn_error_trace(fs->vtable->get_locks(fs, path, depth,
- get_locks_func,
- get_locks_baton, pool));
+ get_locks_func,
+ get_locks_baton, pool));
}
svn_error_t *
@@ -1331,8 +1331,8 @@
void *get_locks_baton, apr_pool_t *pool)
{
return svn_error_trace(svn_fs_get_locks2(fs, path, svn_depth_infinity,
- get_locks_func, get_locks_baton,
- pool));
+ get_locks_func, get_locks_baton,
+ pool));
}
@@ -1344,7 +1344,7 @@
apr_pool_t *pool)
{
return svn_error_trace(history->vtable->prev(prev_history_p, history,
- cross_copies, pool));
+ cross_copies, pool));
}
svn_error_t *
@@ -1352,7 +1352,7 @@
svn_fs_history_t *history, apr_pool_t *pool)
{
return svn_error_trace(history->vtable->location(path, revision, history,
- pool));
+ pool));
}
Index: subversion/libsvn_subr/subst.c
===================================================================
--- subversion/libsvn_subr/subst.c (revision 1140505)
+++ subversion/libsvn_subr/subst.c (working copy)
@@ -1701,14 +1701,14 @@
}
return svn_error_trace(create_special_file_from_stream(src_stream,
- dst, pool));
+ dst, pool));
}
/* else !expand */
return svn_error_trace(detranslate_special_file(src, dst,
- cancel_func,
- cancel_baton,
- pool));
+ cancel_func,
+ cancel_baton,
+ pool));
}
/* The easy way out: no translation needed, just copy. */
Index: subversion/libsvn_subr/sqlite.c
===================================================================
--- subversion/libsvn_subr/sqlite.c (revision 1140505)
+++ subversion/libsvn_subr/sqlite.c (working copy)
@@ -423,9 +423,9 @@
scratch_pool));
properties = svn_skel__unparse(skel, scratch_pool);
return svn_error_trace(svn_sqlite__bind_blob(stmt,
- slot,
- properties->data,
- properties->len));
+ slot,
+ properties->data,
+ properties->len));
}
svn_error_t *
@@ -723,7 +723,7 @@
ub.upgrade_sql = upgrade_sql;
return svn_error_trace(svn_sqlite__with_transaction(
- db, upgrade_format, &ub, scratch_pool));
+ db, upgrade_format, &ub, scratch_pool));
}
return svn_error_createf(SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA, NULL,
@@ -1084,7 +1084,7 @@
{
SVN_ERR(exec_sql(db, "BEGIN TRANSACTION;"));
return svn_error_trace(with_transaction(db, cb_func, cb_baton,
- scratch_pool));
+ scratch_pool));
}
svn_error_t *
@@ -1096,7 +1096,7 @@
{
SVN_ERR(exec_sql(db, "BEGIN IMMEDIATE TRANSACTION;"));
return svn_error_trace(with_transaction(db, cb_func, cb_baton,
- scratch_pool));
+ scratch_pool));
}
svn_error_t *
Index: subversion/libsvn_subr/deprecated.c
===================================================================
--- subversion/libsvn_subr/deprecated.c (revision 1140505)
+++ subversion/libsvn_subr/deprecated.c (working copy)
@@ -129,7 +129,7 @@
keywords, expand, pool);
return svn_error_trace(svn_stream_copy3(src_stream, dst_stream,
- NULL, NULL, pool));
+ NULL, NULL, pool));
}
svn_error_t *
@@ -144,7 +144,7 @@
apr_hash_t *kh = kwstruct_to_kwhash(keywords, pool);
return svn_error_trace(svn_subst_translate_stream3(s, d, eol_str, repair,
- kh, expand, pool));
+ kh, expand, pool));
}
svn_error_t *
@@ -174,8 +174,8 @@
apr_hash_t *kh = kwstruct_to_kwhash(keywords, pool);
return svn_error_trace(svn_subst_translate_cstring2(src, dst, eol_str,
- repair, kh, expand,
- pool));
+ repair, kh, expand,
+ pool));
}
svn_error_t *
@@ -188,8 +188,8 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_subst_copy_and_translate2(src, dst, eol_str,
- repair, keywords,
- expand, FALSE, pool));
+ repair, keywords,
+ expand, FALSE, pool));
}
svn_error_t *
@@ -205,8 +205,8 @@
apr_hash_t *kh = kwstruct_to_kwhash(keywords, pool);
return svn_error_trace(svn_subst_copy_and_translate3(src, dst, eol_str,
- repair, kh, expand,
- special, pool));
+ repair, kh, expand,
+ special, pool));
}
svn_error_t *
@@ -220,10 +220,10 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_subst_copy_and_translate4(src, dst, eol_str,
- repair, keywords,
- expand, special,
- NULL, NULL,
- pool));
+ repair, keywords,
+ expand, special,
+ NULL, NULL,
+ pool));
}
@@ -280,10 +280,10 @@
SVN_ERR(svn_stream_open_readonly(&src_stream, src, pool, pool));
return svn_error_trace(svn_subst_stream_translated_to_normal_form(
- stream_p, src_stream,
- eol_style, eol_str,
- always_repair_eols,
- keywords, pool));
+ stream_p, src_stream,
+ eol_style, eol_str,
+ always_repair_eols,
+ keywords, pool));
}
svn_error_t *
@@ -304,13 +304,13 @@
return svn_error_create(SVN_ERR_IO_UNKNOWN_EOL, NULL, NULL);
return svn_error_trace(svn_subst_copy_and_translate3(
- src, dst, eol_str,
- eol_style == svn_subst_eol_style_fixed
- || always_repair_eols,
- keywords,
- FALSE /* contract keywords */,
- special,
- pool));
+ src, dst, eol_str,
+ eol_style == svn_subst_eol_style_fixed
+ || always_repair_eols,
+ keywords,
+ FALSE /* contract keywords */,
+ special,
+ pool));
}
@@ -454,7 +454,7 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_opt__args_to_target_array(targets_p, os,
- known_targets, pool));
+ known_targets, pool));
}
svn_error_t *
@@ -535,16 +535,16 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_opt_print_help3(os,
- pgm_name,
- print_version,
- quiet,
- version_footer,
- header,
- cmd_table,
- option_table,
- NULL,
- footer,
- pool));
+ pgm_name,
+ print_version,
+ quiet,
+ version_footer,
+ header,
+ cmd_table,
+ option_table,
+ NULL,
+ footer,
+ pool));
}
svn_error_t *
@@ -643,9 +643,9 @@
svn_path_split(path, &dirpath, &filename, pool);
return svn_error_trace(svn_io_open_uniquely_named(file, temp_path,
- dirpath, filename, suffix,
- delete_when,
- pool, pool));
+ dirpath, filename, suffix,
+ delete_when,
+ pool, pool));
}
svn_error_t *
@@ -657,11 +657,11 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_io_open_unique_file2(file, temp_path,
- path, suffix,
- delete_on_close
- ? svn_io_file_del_on_close
- : svn_io_file_del_none,
- pool));
+ path, suffix,
+ delete_on_close
+ ? svn_io_file_del_on_close
+ : svn_io_file_del_none,
+ pool));
}
svn_error_t *
@@ -681,10 +681,10 @@
SVN_ERR(svn_path_cstring_to_utf8(&diff_cmd, diff_cmd, pool));
return svn_error_trace(svn_io_run_diff2(dir, user_args, num_user_args,
- label1, label2,
- from, to, pexitcode,
- outfile, errfile, diff_cmd,
- pool));
+ label1, label2,
+ from, to, pexitcode,
+ outfile, errfile, diff_cmd,
+ pool));
}
svn_error_t *
@@ -704,10 +704,10 @@
SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool));
return svn_error_trace(svn_io_run_diff3_3(exitcode, dir,
- mine, older, yours,
- mine_label, older_label,
- yours_label, merged,
- diff3_cmd, user_args, pool));
+ mine, older, yours,
+ mine_label, older_label,
+ yours_label, merged,
+ diff3_cmd, user_args, pool));
}
svn_error_t *
@@ -724,9 +724,9 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_io_run_diff3_2(exitcode, dir, mine, older, yours,
- mine_label, older_label,
- yours_label,
- merged, diff3_cmd, NULL, pool));
+ mine_label, older_label,
+ yours_label,
+ merged, diff3_cmd, NULL, pool));
}
svn_error_t *
@@ -821,8 +821,8 @@
baton.walk_func = walk_func;
baton.walk_baton = walk_baton;
return svn_error_trace(svn_io_dir_walk2(dirname, wanted,
- walk_func_filter_func,
- &baton, pool));
+ walk_func_filter_func,
+ &baton, pool));
}
/*** From constructors.c ***/
@@ -849,7 +849,7 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_cmdline_prompt_user2(result, prompt_str, NULL,
- pool));
+ pool));
}
svn_error_t *
@@ -865,10 +865,10 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_cmdline_create_auth_baton(
- ab, non_interactive,
- auth_username, auth_password,
- config_dir, no_auth_cache, FALSE,
- cfg, cancel_func, cancel_baton, pool));
+ ab, non_interactive,
+ auth_username, auth_password,
+ config_dir, no_auth_cache, FALSE,
+ cfg, cancel_func, cancel_baton, pool));
}
/*** From dso.c ***/
@@ -973,18 +973,18 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_stream_copy3(
- svn_stream_disown(from, scratch_pool),
- svn_stream_disown(to, scratch_pool),
- cancel_func, cancel_baton, scratch_pool));
+ svn_stream_disown(from, scratch_pool),
+ svn_stream_disown(to, scratch_pool),
+ cancel_func, cancel_baton, scratch_pool));
}
svn_error_t *svn_stream_copy(svn_stream_t *from, svn_stream_t *to,
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_stream_copy3(
- svn_stream_disown(from, scratch_pool),
- svn_stream_disown(to, scratch_pool),
- NULL, NULL, scratch_pool));
+ svn_stream_disown(from, scratch_pool),
+ svn_stream_disown(to, scratch_pool),
+ NULL, NULL, scratch_pool));
}
svn_stream_t *
@@ -1000,10 +1000,10 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_stream_contents_same2(
- same,
- svn_stream_disown(stream1, pool),
- svn_stream_disown(stream2, pool),
- pool));
+ same,
+ svn_stream_disown(stream1, pool),
+ svn_stream_disown(stream2, pool),
+ pool));
}
/*** From path.c ***/
@@ -1056,8 +1056,8 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_mergeinfo_inheritable2(output, mergeinfo, path,
- start, end,
- TRUE, pool, pool));
+ start, end,
+ TRUE, pool, pool));
}
svn_error_t *
@@ -1068,9 +1068,9 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_rangelist_inheritable2(inheritable_rangelist,
- rangelist,
- start, end, TRUE,
- pool, pool));
+ rangelist,
+ start, end, TRUE,
+ pool, pool));
}
/*** From config.c ***/
@@ -1081,9 +1081,9 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_config_read2(cfgp, file,
- must_exist,
- FALSE,
- pool));
+ must_exist,
+ FALSE,
+ pool));
}
#ifdef SVN_DISABLE_FULL_VERSION_MATCH
Index: subversion/libsvn_subr/stream.c
===================================================================
--- subversion/libsvn_subr/stream.c (revision 1140505)
+++ subversion/libsvn_subr/stream.c (working copy)
@@ -462,7 +462,7 @@
apr_pool_t *pool)
{
return svn_error_trace(stream_readline(stringbuf, eof, eol, stream,
- pool));
+ pool));
}
svn_error_t *svn_stream_copy3(svn_stream_t *from, svn_stream_t *to,
Index: subversion/libsvn_subr/svn_string.c
===================================================================
--- subversion/libsvn_subr/svn_string.c (revision 1140505)
+++ subversion/libsvn_subr/svn_string.c (working copy)
@@ -783,7 +783,7 @@
svn_cstring_atoui64(apr_uint64_t *n, const char *str)
{
return svn_error_trace(svn_cstring_strtoui64(n, str, 0,
- APR_UINT64_MAX, 10));
+ APR_UINT64_MAX, 10));
}
svn_error_t *
@@ -827,7 +827,7 @@
svn_cstring_atoi64(apr_int64_t *n, const char *str)
{
return svn_error_trace(svn_cstring_strtoi64(n, str, APR_INT64_MIN,
- APR_INT64_MAX, 10));
+ APR_INT64_MAX, 10));
}
svn_error_t *
Index: subversion/libsvn_wc/relocate.c
===================================================================
--- subversion/libsvn_wc/relocate.c (revision 1140505)
+++ subversion/libsvn_wc/relocate.c (working copy)
@@ -165,6 +165,6 @@
scratch_pool));
return svn_error_trace(svn_wc__db_global_relocate(wc_ctx->db, local_abspath,
- new_repos_root,
- scratch_pool));
+ new_repos_root,
+ scratch_pool));
}
Index: subversion/libsvn_wc/deprecated.c
===================================================================
--- subversion/libsvn_wc/deprecated.c (revision 1140505)
+++ subversion/libsvn_wc/deprecated.c (working copy)
@@ -2414,7 +2414,7 @@
scratch_pool);
return svn_error_trace(btn->inner_func(result, cd, btn->inner_baton,
- result_pool));
+ result_pool));
}
svn_error_t *
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 1140505)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -370,17 +370,17 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__perform_props_merge(
- state,
- wc_ctx->db,
- local_abspath,
- left_version, right_version,
- baseprops,
- propchanges,
- FALSE /* base_merge */,
- dry_run,
- conflict_func, conflict_baton,
- cancel_func, cancel_baton,
- scratch_pool));
+ state,
+ wc_ctx->db,
+ local_abspath,
+ left_version, right_version,
+ baseprops,
+ propchanges,
+ FALSE /* base_merge */,
+ dry_run,
+ conflict_func, conflict_baton,
+ cancel_func, cancel_baton,
+ scratch_pool));
}
@@ -1766,8 +1766,8 @@
apr_hash_set(prophash, name, APR_HASH_KEY_STRING, value);
return svn_error_trace(svn_wc__db_base_set_dav_cache(db, local_abspath,
- prophash,
- scratch_pool));
+ prophash,
+ scratch_pool));
}
@@ -1785,7 +1785,7 @@
### should not have any ACTUAL props. */
return svn_error_trace(svn_wc__db_read_props(props, db, local_abspath,
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
}
@@ -1797,10 +1797,10 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__get_actual_props(props,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ result_pool,
+ scratch_pool));
}
struct propname_filter_baton_t {
@@ -1965,10 +1965,10 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__get_pristine_props(props,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ result_pool,
+ scratch_pool));
}
@@ -2435,7 +2435,7 @@
{
SVN_ERR_ASSERT(depth == svn_depth_empty);
return svn_error_trace(wcprop_set(wc_ctx->db, local_abspath,
- name, value, scratch_pool));
+ name, value, scratch_pool));
}
/* We have to do this little DIR_ABSPATH dance for backwards compat.
Index: subversion/libsvn_wc/wc_db_wcroot.c
===================================================================
--- subversion/libsvn_wc/wc_db_wcroot.c (revision 1140505)
+++ subversion/libsvn_wc/wc_db_wcroot.c (working copy)
@@ -225,7 +225,7 @@
/* Run the cleanup for each WCROOT. */
return svn_error_trace(svn_wc__db_close_many_wcroots(roots, db->state_pool,
- scratch_pool));
+ scratch_pool));
}
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 1140505)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -1777,19 +1777,19 @@
SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
scratch_pool));
return svn_error_trace(new_revert_changelist(wc_ctx->db, local_abspath,
- depth, use_commit_times,
- changelist_hash,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
+ depth, use_commit_times,
+ changelist_hash,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ scratch_pool));
}
if (depth == svn_depth_empty || depth == svn_depth_infinity)
return svn_error_trace(new_revert_internal(wc_ctx->db, local_abspath,
- depth, use_commit_times,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
+ depth, use_commit_times,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ scratch_pool));
/* The user may expect svn_depth_files/svn_depth_immediates to work
on copied dirs with one level of children. It doesn't, the user
@@ -1799,10 +1799,10 @@
if (depth == svn_depth_files || depth == svn_depth_immediates)
return svn_error_trace(new_revert_partial(wc_ctx->db, local_abspath,
- depth, use_commit_times,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
+ depth, use_commit_times,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ scratch_pool));
/* Bogus depth. Tell the caller. */
return svn_error_create(SVN_ERR_WC_INVALID_OPERATION_DEPTH, NULL, NULL);
@@ -1863,10 +1863,10 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__get_pristine_contents(contents, NULL,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ result_pool,
+ scratch_pool));
}
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c (revision 1140505)
+++ subversion/libsvn_wc/status.c (working copy)
@@ -821,7 +821,7 @@
if (statstruct && status_func)
return svn_error_trace((*status_func)(status_baton, local_abspath,
- statstruct, scratch_pool));
+ statstruct, scratch_pool));
return SVN_NO_ERROR;
}
@@ -964,7 +964,7 @@
entry to the status func. */
if (no_ignore || (! is_ignored) || is_external)
return svn_error_trace((*status_func)(status_baton, local_abspath,
- status, scratch_pool));
+ status, scratch_pool));
return SVN_NO_ERROR;
}
@@ -2454,10 +2454,10 @@
if (node_kind == svn_wc__db_kind_unknown)
return svn_error_trace(assemble_unversioned(status,
- db, local_abspath,
- dirent->kind,
- FALSE /* is_ignored */,
- result_pool, scratch_pool));
+ db, local_abspath,
+ dirent->kind,
+ FALSE /* is_ignored */,
+ result_pool, scratch_pool));
if (svn_dirent_is_root(local_abspath, strlen(local_abspath)))
is_root = TRUE;
@@ -2505,14 +2505,14 @@
}
return svn_error_trace(assemble_status(status, db, local_abspath,
- parent_repos_root_url,
- parent_repos_relpath,
- NULL,
- dirent,
- TRUE /* get_all */,
- FALSE,
- NULL /* repos_lock */,
- result_pool, scratch_pool));
+ parent_repos_root_url,
+ parent_repos_relpath,
+ NULL,
+ dirent,
+ TRUE /* get_all */,
+ FALSE,
+ NULL /* repos_lock */,
+ result_pool, scratch_pool));
}
@@ -2579,7 +2579,7 @@
SVN_ERR(svn_wc_get_default_ignores(&default_ignores, config, scratch_pool));
return svn_error_trace(collect_ignore_patterns(patterns, wc_ctx->db,
- local_abspath,
- default_ignores,
- result_pool, scratch_pool));
+ local_abspath,
+ default_ignores,
+ result_pool, scratch_pool));
}
Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/adm_files.c (revision 1140505)
+++ subversion/libsvn_wc/adm_files.c (working copy)
@@ -316,7 +316,7 @@
local_abspath = svn_wc__adm_child(dir_abspath, fname, scratch_pool);
return svn_error_trace(svn_stream_open_readonly(stream, local_abspath,
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
}
@@ -450,8 +450,8 @@
just create one. */
if (format == 0)
return svn_error_trace(init_adm(db, local_abspath,
- repos_relpath, repos_root_url, repos_uuid,
- revision, depth, scratch_pool));
+ repos_relpath, repos_root_url, repos_uuid,
+ revision, depth, scratch_pool));
SVN_ERR(svn_wc__db_read_info(&status, NULL,
&db_revision, &db_repos_relpath,
Index: subversion/libsvn_wc/conflicts.c
===================================================================
--- subversion/libsvn_wc/conflicts.c (revision 1140505)
+++ subversion/libsvn_wc/conflicts.c (working copy)
@@ -330,12 +330,12 @@
svn_boolean_t ignored_result;
return svn_error_trace(resolve_conflict_on_node(
- db, local_abspath,
- TRUE /* resolve_text */,
- FALSE /* resolve_props */,
- svn_wc_conflict_choose_merged,
- &ignored_result,
- scratch_pool));
+ db, local_abspath,
+ TRUE /* resolve_text */,
+ FALSE /* resolve_props */,
+ svn_wc_conflict_choose_merged,
+ &ignored_result,
+ scratch_pool));
}
@@ -629,15 +629,15 @@
depth = svn_depth_infinity;
return svn_error_trace(recursive_resolve_conflict(
- wc_ctx->db,
- local_abspath,
- conflicted,
- depth,
- resolve_text,
- resolve_prop,
- resolve_tree,
- conflict_choice,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ conflicted,
+ depth,
+ resolve_text,
+ resolve_prop,
+ resolve_tree,
+ conflict_choice,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ scratch_pool));
}
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 1140505)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -1570,9 +1570,9 @@
/* A conflict was detected. Append log commands to the log accumulator
* to record it. */
return svn_error_trace(create_tree_conflict(pconflict, eb, local_abspath,
- reason, action, their_node_kind,
- their_relpath,
- result_pool, scratch_pool));
+ reason, action, their_node_kind,
+ their_relpath,
+ result_pool, scratch_pool));
}
@@ -5047,9 +5047,9 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_is_wcroot(wc_root,
- wc_ctx->db,
- local_abspath,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ scratch_pool));
}
@@ -5391,6 +5391,6 @@
pool));
return svn_error_trace(svn_wc__wq_run(db, dir_abspath,
- cancel_func, cancel_baton,
- pool));
+ cancel_func, cancel_baton,
+ pool));
}
Index: subversion/libsvn_wc/lock.c
===================================================================
--- subversion/libsvn_wc/lock.c (revision 1140505)
+++ subversion/libsvn_wc/lock.c (working copy)
@@ -786,8 +786,8 @@
}
return svn_error_trace(open_all(adm_access, path, db, db_provided,
- write_lock, levels_to_lock,
- cancel_func, cancel_baton, pool));
+ write_lock, levels_to_lock,
+ cancel_func, cancel_baton, pool));
}
@@ -1322,9 +1322,9 @@
apr_pool_t *pool)
{
return svn_error_trace(open_anchor(anchor_access, target_access, target,
- NULL, FALSE, path, write_lock,
- levels_to_lock, cancel_func,
- cancel_baton, pool));
+ NULL, FALSE, path, write_lock,
+ levels_to_lock, cancel_func,
+ cancel_baton, pool));
}
@@ -1380,7 +1380,7 @@
}
return svn_error_trace(close_single(adm_access, preserve_lock,
- scratch_pool));
+ scratch_pool));
}
Index: subversion/libsvn_wc/questions.c
===================================================================
--- subversion/libsvn_wc/questions.c (revision 1140505)
+++ subversion/libsvn_wc/questions.c (working copy)
@@ -496,11 +496,11 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__internal_conflicted_p(text_conflicted_p,
- prop_conflicted_p,
- tree_conflicted_p,
- wc_ctx->db,
- local_abspath,
- scratch_pool));
+ prop_conflicted_p,
+ tree_conflicted_p,
+ wc_ctx->db,
+ local_abspath,
+ scratch_pool));
}
svn_error_t *
@@ -512,11 +512,11 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_min_max_revisions(min_revision,
- max_revision,
- wc_ctx->db,
- local_abspath,
- committed,
- scratch_pool));
+ max_revision,
+ wc_ctx->db,
+ local_abspath,
+ committed,
+ scratch_pool));
}
@@ -527,9 +527,9 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_is_sparse_checkout(is_sparse_checkout,
- wc_ctx->db,
- local_abspath,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ scratch_pool));
}
@@ -541,10 +541,10 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_has_switched_subtrees(is_switched,
- wc_ctx->db,
- local_abspath,
- trail_url,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ trail_url,
+ scratch_pool));
}
@@ -557,9 +557,9 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_has_local_mods(is_modified,
- wc_ctx->db,
- local_abspath,
- cancel_func,
- cancel_baton,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ cancel_func,
+ cancel_baton,
+ scratch_pool));
}
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 1140505)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -1093,12 +1093,12 @@
if (wc_format < SVN_WC__WC_NG_VERSION)
return svn_error_trace(svn_wc__read_entries_old(entries,
- wcroot_abspath,
- result_pool,
- scratch_pool));
+ wcroot_abspath,
+ result_pool,
+ scratch_pool));
return svn_error_trace(read_entries_new(entries, db, wcroot_abspath,
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
}
Index: subversion/libsvn_wc/wc_db.c
===================================================================
--- subversion/libsvn_wc/wc_db.c (revision 1140505)
+++ subversion/libsvn_wc/wc_db.c (working copy)
@@ -3176,7 +3176,7 @@
svn_pool_destroy(iterpool);
return svn_error_trace(svn_error_compose_create(err,
- svn_sqlite__reset(stmt)));
+ svn_sqlite__reset(stmt)));
}
/* Copy the ACTUAL data for SRC_RELPATH and tweak it to refer to DST_RELPATH.
@@ -4650,8 +4650,8 @@
spb.work_items = work_items;
return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
- set_props_txn, &spb,
- scratch_pool));
+ set_props_txn, &spb,
+ scratch_pool));
}
@@ -5003,12 +5003,12 @@
/* Perform the set-changelist operation (transactionally), perform any
notifications necessary, and then clean out our temporary tables. */
return svn_error_trace(with_finalization(wcroot, local_relpath,
- set_changelist_txn, &scb,
- do_changelist_notify, NULL,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- STMT_FINALIZE_CHANGELIST,
- scratch_pool));
+ set_changelist_txn, &scb,
+ do_changelist_notify, NULL,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ STMT_FINALIZE_CHANGELIST,
+ scratch_pool));
}
@@ -6231,12 +6231,12 @@
/* Perform the deletion operation (transactionally), perform any
notifications necessary, and then clean out our temporary tables. */
return svn_error_trace(with_finalization(wcroot, local_relpath,
- op_delete_txn, &odb,
- do_delete_notify, NULL,
- cancel_func, cancel_baton,
- notify_func, notify_baton,
- STMT_FINALIZE_DELETE,
- scratch_pool));
+ op_delete_txn, &odb,
+ do_delete_notify, NULL,
+ cancel_func, cancel_baton,
+ notify_func, notify_baton,
+ STMT_FINALIZE_DELETE,
+ scratch_pool));
}
@@ -7355,7 +7355,7 @@
VERIFY_USABLE_WCROOT(wcroot);
return svn_error_trace(read_url(url, wcroot, local_relpath, result_pool,
- scratch_pool));
+ scratch_pool));
}
@@ -8625,7 +8625,7 @@
revision != new_rev)))
{
return svn_error_trace(db_base_remove(NULL, wcroot, local_relpath,
- scratch_pool));
+ scratch_pool));
}
if (new_repos_relpath != NULL && strcmp(repos_relpath, new_repos_relpath))
@@ -9211,8 +9211,8 @@
sab.result_pool = result_pool;
return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
- scan_addition_txn,
- &sab, scratch_pool));
+ scan_addition_txn,
+ &sab, scratch_pool));
}
@@ -9486,8 +9486,8 @@
sd_baton.result_pool = result_pool;
return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
- scan_deletion_txn, &sd_baton,
- scratch_pool));
+ scan_deletion_txn, &sd_baton,
+ scratch_pool));
}
@@ -9551,9 +9551,9 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(create_db(sdb, repos_id, wc_id, dir_abspath,
- repos_root_url, repos_uuid,
- SDB_FILE,
- result_pool, scratch_pool));
+ repos_root_url, repos_uuid,
+ SDB_FILE,
+ result_pool, scratch_pool));
}
@@ -9837,7 +9837,7 @@
/* Add the work item(s) to the WORK_QUEUE. */
return svn_error_trace(add_work_items(wcroot->sdb, work_item,
- scratch_pool));
+ scratch_pool));
}
/* Baton for wq_fetch_next */
@@ -10703,8 +10703,8 @@
baton.levels_to_lock = levels_to_lock;
return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
- wclock_obtain_cb, &baton,
- scratch_pool));
+ wclock_obtain_cb, &baton,
+ scratch_pool));
}
@@ -11572,8 +11572,8 @@
VERIFY_USABLE_WCROOT(wcroot);
return svn_error_trace(get_min_max_revisions(min_revision, max_revision,
- wcroot, local_relpath,
- committed, scratch_pool));
+ wcroot, local_relpath,
+ committed, scratch_pool));
}
@@ -11621,8 +11621,8 @@
VERIFY_USABLE_WCROOT(wcroot);
return svn_error_trace(is_sparse_checkout_internal(is_sparse_checkout,
- wcroot, local_relpath,
- scratch_pool));
+ wcroot, local_relpath,
+ scratch_pool));
}
@@ -11732,8 +11732,8 @@
VERIFY_USABLE_WCROOT(wcroot);
return svn_error_trace(has_switched_subtrees(is_switched, wcroot,
- local_relpath, trail_url,
- scratch_pool));
+ local_relpath, trail_url,
+ scratch_pool));
}
svn_error_t *
@@ -11918,8 +11918,8 @@
VERIFY_USABLE_WCROOT(wcroot);
return svn_error_trace(has_local_mods(is_modified, wcroot, local_relpath,
- db, cancel_func, cancel_baton,
- scratch_pool));
+ db, cancel_func, cancel_baton,
+ scratch_pool));
}
@@ -12029,8 +12029,8 @@
VERIFY_USABLE_WCROOT(wcroot);
return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
- revision_status_txn, &rsb,
- scratch_pool));
+ revision_status_txn, &rsb,
+ scratch_pool));
}
Index: subversion/libsvn_wc/node.c
===================================================================
--- subversion/libsvn_wc/node.c (revision 1140505)
+++ subversion/libsvn_wc/node.c (working copy)
@@ -352,7 +352,7 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_read_url(url, wc_ctx->db, local_abspath,
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
}
/* ### This is essentially a copy-paste of svn_wc__internal_get_url().
@@ -885,7 +885,7 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(get_base_rev(base_revision, wc_ctx->db,
- local_abspath, scratch_pool));
+ local_abspath, scratch_pool));
}
svn_error_t *
@@ -1035,8 +1035,8 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__internal_get_commit_base_rev(
- commit_base_revision, wc_ctx->db, local_abspath,
- scratch_pool));
+ commit_base_revision, wc_ctx->db, local_abspath,
+ scratch_pool));
}
svn_error_t *
@@ -1307,10 +1307,10 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_get_absent_subtrees(absent_subtrees,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
+ wc_ctx->db,
+ local_abspath,
+ result_pool,
+ scratch_pool));
}
svn_error_t *
@@ -1436,9 +1436,9 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__internal_get_origin(is_copy, revision,
- repos_relpath, repos_root_url, repos_uuid,
- wc_ctx->db, local_abspath, scan_deleted,
- result_pool, scratch_pool));
+ repos_relpath, repos_root_url, repos_uuid,
+ wc_ctx->db, local_abspath, scan_deleted,
+ result_pool, scratch_pool));
}
svn_error_t *
@@ -1566,11 +1566,11 @@
apr_pool_t *scratch_pool)
{
return svn_error_trace(svn_wc__db_pristine_get_md5(md5_checksum,
- wc_ctx->db,
- wri_abspath,
- sha1_checksum,
- result_pool,
- scratch_pool));
+ wc_ctx->db,
+ wri_abspath,
+ sha1_checksum,
+ result_pool,
+ scratch_pool));
}
svn_error_t *
Index: subversion/libsvn_wc/upgrade.c
===================================================================
--- subversion/libsvn_wc/upgrade.c (revision 1140505)
+++ subversion/libsvn_wc/upgrade.c (working copy)
@@ -647,9 +647,9 @@
svn_dirent_local_style(local_abspath, scratch_pool));
return svn_error_trace((*repos_info_func)(&entry->repos, &entry->uuid,
- repos_info_baton,
- entry->url,
- result_pool, scratch_pool));
+ repos_info_baton,
+ entry->url,
+ result_pool, scratch_pool));
}
Index: subversion/libsvn_wc/workqueue.c
===================================================================
--- subversion/libsvn_wc/workqueue.c (revision 1140505)
+++ subversion/libsvn_wc/workqueue.c (working copy)
@@ -87,9 +87,9 @@
}
return svn_error_trace(svn_wc__db_global_record_fileinfo(
- db, local_abspath,
- dirent->filesize, dirent->mtime,
- scratch_pool));
+ db, local_abspath,
+ dirent->filesize, dirent->mtime,
+ scratch_pool));
}
@@ -828,7 +828,7 @@
/* Remove the path, no worrying if it isn't there. */
return svn_error_trace(svn_io_remove_file2(local_abspath, TRUE,
- scratch_pool));
+ scratch_pool));
}
@@ -1204,8 +1204,8 @@
return svn_error_trace(get_and_record_fileinfo(db, local_abspath,
- TRUE /* ignore_enoent */,
- scratch_pool));
+ TRUE /* ignore_enoent */,
+ scratch_pool));
}
@@ -1379,9 +1379,9 @@
return svn_error_trace(
svn_wc__db_temp_op_set_property_conflict_marker_file(db,
- local_abspath,
- prej_abspath,
- scratch_pool));
+ local_abspath,
+ prej_abspath,
+ scratch_pool));
}
svn_error_t *
Index: subversion/libsvn_client/relocate.c
===================================================================
--- subversion/libsvn_client/relocate.c (revision 1140505)
+++ subversion/libsvn_client/relocate.c (working copy)
@@ -242,8 +242,8 @@
if (ignore_externals)
{
return svn_error_trace(svn_wc_relocate4(ctx->wc_ctx, local_abspath,
- from_prefix, to_prefix,
- validator_func, &vb, pool));
+ from_prefix, to_prefix,
+ validator_func, &vb, pool));
}
/* Fetch our current root URL. */
Index: subversion/libsvn_client/deprecated.c
===================================================================
--- subversion/libsvn_client/deprecated.c (revision 1140505)
+++ subversion/libsvn_client/deprecated.c (working copy)
@@ -2078,8 +2078,8 @@
peg_revision.kind = svn_opt_revision_unspecified;
return svn_error_trace(svn_client_checkout2(result_rev, URL, path,
- &peg_revision, revision, recurse,
- FALSE, ctx, pool));
+ &peg_revision, revision, recurse,
+ FALSE, ctx, pool));
}
/*** From info.c ***/
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 1140505)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -121,11 +121,11 @@
determination, returning an error if it finds anything that shouldn't
be deleted. */
return svn_error_trace(svn_client_status5(NULL, ctx, path, &revision,
- svn_depth_infinity, FALSE,
- FALSE, FALSE, FALSE, FALSE,
- NULL,
- find_undeletables, NULL,
- scratch_pool));
+ svn_depth_infinity, FALSE,
+ FALSE, FALSE, FALSE, FALSE,
+ NULL,
+ find_undeletables, NULL,
+ scratch_pool));
}
@@ -322,9 +322,9 @@
if (!dry_run)
/* Mark the entry for commit deletion and perform wc deletion */
return svn_error_trace(svn_wc_delete4(ctx->wc_ctx, local_abspath,
- keep_local, TRUE,
- ctx->cancel_func, ctx->cancel_baton,
- notify_func, notify_baton, pool));
+ keep_local, TRUE,
+ ctx->cancel_func, ctx->cancel_baton,
+ notify_func, notify_baton, pool));
return SVN_NO_ERROR;
}
Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c (revision 1140505)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -1262,12 +1262,12 @@
}
return svn_error_trace(merge_props_changed(state,
- tree_conflicted,
- local_abspath,
- propchanges,
- original_props,
- diff_baton,
- scratch_pool));
+ tree_conflicted,
+ local_abspath,
+ propchanges,
+ original_props,
+ diff_baton,
+ scratch_pool));
}
/* Contains any state collected while resolving conflicts. */
Index: subversion/libsvn_client/prop_commands.c
===================================================================
--- subversion/libsvn_client/prop_commands.c (revision 1140505)
+++ subversion/libsvn_client/prop_commands.c (working copy)
@@ -586,10 +586,10 @@
if (pristine)
{
return svn_error_trace(svn_wc_get_pristine_props(props,
- wc_ctx,
- local_abspath,
- result_pool,
- scratch_pool));
+ wc_ctx,
+ local_abspath,
+ result_pool,
+ scratch_pool));
}
/* ### until svn_wc_prop_list2() returns a NULL value for locally-deleted
@@ -607,7 +607,7 @@
}
return svn_error_trace(svn_wc_prop_list2(props, wc_ctx, local_abspath,
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
}
@@ -1093,7 +1093,7 @@
path = local_abspath;
return svn_error_trace(b->wrapped_receiver(b->wrapped_receiver_baton,
- path, props, scratch_pool));
+ path, props, scratch_pool));
}
svn_error_t *
Index: subversion/libsvn_client/ra.c
===================================================================
--- subversion/libsvn_client/ra.c (revision 1140505)
+++ subversion/libsvn_client/ra.c (working copy)
@@ -108,8 +108,8 @@
{
SVN_ERR_ASSERT(svn_dirent_is_absolute(item->path));
return svn_error_trace(svn_wc_prop_get2(value, cb->ctx->wc_ctx,
- item->path, name,
- pool, pool));
+ item->path, name,
+ pool, pool));
}
}
@@ -123,7 +123,7 @@
local_abspath = svn_dirent_join(cb->base_dir_abspath, relpath, pool);
return svn_error_trace(svn_wc_prop_get2(value, cb->ctx->wc_ctx,
- local_abspath, name, pool, pool));
+ local_abspath, name, pool, pool));
}
/* This implements the 'svn_ra_push_wc_prop_func_t' interface. */
@@ -194,13 +194,13 @@
Unfortunately, we don't have a clean mechanism for doing that
here, so we just set the property and hope for the best. */
return svn_error_trace(svn_wc_prop_set4(cb->ctx->wc_ctx, local_abspath,
- name,
- value, svn_depth_empty,
- TRUE /* skip_checks */,
- NULL /* changelist_filter */,
- NULL, NULL /* cancellation */,
- NULL, NULL /* notification */,
- pool));
+ name,
+ value, svn_depth_empty,
+ TRUE /* skip_checks */,
+ NULL /* changelist_filter */,
+ NULL, NULL /* cancellation */,
+ NULL, NULL /* notification */,
+ pool));
}
Index: subversion/libsvn_client/cat.c
===================================================================
--- subversion/libsvn_client/cat.c (revision 1140505)
+++ subversion/libsvn_client/cat.c (working copy)
@@ -219,8 +219,8 @@
output = svn_stream_disown(output, pool);
return svn_error_trace(svn_stream_copy3(normal_stream, output,
- ctx->cancel_func,
- ctx->cancel_baton, pool));
+ ctx->cancel_func,
+ ctx->cancel_baton, pool));
}
/* Get an RA plugin for this filesystem object. */
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 1140505)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -873,12 +873,12 @@
path = svn_dirent_join(diff_cmd_baton->anchor, path, scratch_pool);
return svn_error_trace(diff_props_changed(state,
- tree_conflicted, path,
- dir_was_added,
- propchanges,
- original_props,
- diff_baton,
- scratch_pool));
+ tree_conflicted, path,
+ dir_was_added,
+ propchanges,
+ original_props,
+ diff_baton,
+ scratch_pool));
}
Index: subversion/libsvn_client/copy.c
===================================================================
--- subversion/libsvn_client/copy.c (revision 1140505)
+++ subversion/libsvn_client/copy.c (working copy)
@@ -2257,7 +2257,7 @@
/* Copy or move all targets. */
if (is_move)
return svn_error_trace(do_wc_to_wc_moves(copy_pairs, dst_path_in, ctx,
- pool));
+ pool));
else
return svn_error_trace(do_wc_to_wc_copies(copy_pairs, ctx, pool));
}
Index: subversion/libsvn_client/commit.c
===================================================================
--- subversion/libsvn_client/commit.c (revision 1140505)
+++ subversion/libsvn_client/commit.c (working copy)
@@ -166,8 +166,8 @@
/* Send the file's contents to the delta-window handler. */
return svn_error_trace(svn_txdelta_send_stream(contents, handler,
- handler_baton, digest,
- pool));
+ handler_baton, digest,
+ pool));
}
@@ -1373,15 +1373,15 @@
/* Sort and condense our COMMIT_ITEMS. */
cmt_err = svn_error_trace(svn_client__condense_commit_items(&base_url,
- commit_items,
- pool));
+ commit_items,
+ pool));
if (cmt_err)
goto cleanup;
/* Collect our lock tokens with paths relative to base_url. */
cmt_err = svn_error_trace(collect_lock_tokens(&lock_tokens, lock_tokens,
- base_url, pool));
+ base_url, pool));
if (cmt_err)
goto cleanup;
@@ -1479,5 +1479,5 @@
svn_pool_destroy(iterpool);
return svn_error_trace(reconcile_errors(cmt_err, unlock_err, bump_err,
- pool));
+ pool));
}
Index: subversion/libsvn_ra_neon/commit.c
===================================================================
--- subversion/libsvn_ra_neon/commit.c (revision 1140505)
+++ subversion/libsvn_ra_neon/commit.c (working copy)
@@ -603,11 +603,11 @@
apr_psprintf(pool, "(<%s>)", rb->token));
return svn_error_trace(svn_ra_neon__do_proppatch(rb->cc->ras,
- proppatch_target,
- rb->prop_changes,
- rb->prop_deletes,
- NULL, extra_headers,
- pool));
+ proppatch_target,
+ rb->prop_changes,
+ rb->prop_deletes,
+ NULL, extra_headers,
+ pool));
}
@@ -710,8 +710,8 @@
}
return svn_error_trace(svn_ra_neon__do_proppatch(cc->ras, proppatch_url,
- cc->revprop_table,
- NULL, NULL, NULL, pool));
+ cc->revprop_table,
+ NULL, NULL, NULL, pool));
}
Index: subversion/libsvn_ra_serf/update.c
===================================================================
--- subversion/libsvn_ra_serf/update.c (revision 1140505)
+++ subversion/libsvn_ra_serf/update.c (working copy)
@@ -464,9 +464,9 @@
prop_name = svn_ra_serf__svnname_from_wirename(ns, name, scratch_pool);
if (prop_name != NULL)
return svn_error_trace(editor->change_file_prop(info->file_baton,
- prop_name,
- val,
- scratch_pool));
+ prop_name,
+ val,
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -485,9 +485,9 @@
prop_name = svn_ra_serf__svnname_from_wirename(ns, name, scratch_pool);
if (prop_name != NULL)
return svn_error_trace(editor->change_dir_prop(dir->dir_baton,
- prop_name,
- val,
- scratch_pool));
+ prop_name,
+ val,
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -506,9 +506,9 @@
prop_name = svn_ra_serf__svnname_from_wirename(ns, name, scratch_pool);
if (prop_name != NULL)
return svn_error_trace(editor->change_file_prop(info->file_baton,
- prop_name,
- NULL,
- scratch_pool));
+ prop_name,
+ NULL,
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -527,9 +527,9 @@
prop_name = svn_ra_serf__svnname_from_wirename(ns, name, scratch_pool);
if (prop_name != NULL)
return svn_error_trace(editor->change_dir_prop(dir->dir_baton,
- prop_name,
- NULL,
- scratch_pool));
+ prop_name,
+ NULL,
+ scratch_pool));
return SVN_NO_ERROR;
}
Index: subversion/libsvn_repos/deprecated.c
===================================================================
--- subversion/libsvn_repos/deprecated.c (revision 1140505)
+++ subversion/libsvn_repos/deprecated.c (working copy)
@@ -429,9 +429,9 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_repos_fs_get_locks2(locks, repos, path,
- svn_depth_infinity,
- authz_read_func,
- authz_read_baton, pool));
+ svn_depth_infinity,
+ authz_read_func,
+ authz_read_baton, pool));
}
@@ -677,18 +677,18 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_repos_dump_fs3(repos,
- stream,
- start_rev,
- end_rev,
- incremental,
- use_deltas,
- feedback_stream
- ? repos_notify_handler
- : NULL,
- feedback_stream,
- cancel_func,
- cancel_baton,
- pool));
+ stream,
+ start_rev,
+ end_rev,
+ incremental,
+ use_deltas,
+ feedback_stream
+ ? repos_notify_handler
+ : NULL,
+ feedback_stream,
+ cancel_func,
+ cancel_baton,
+ pool));
}
svn_error_t *
@@ -701,15 +701,15 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_repos_verify_fs2(repos,
- start_rev,
- end_rev,
- feedback_stream
- ? repos_notify_handler
- : NULL,
- feedback_stream,
- cancel_func,
- cancel_baton,
- pool));
+ start_rev,
+ end_rev,
+ feedback_stream
+ ? repos_notify_handler
+ : NULL,
+ feedback_stream,
+ cancel_func,
+ cancel_baton,
+ pool));
}
/*** From load.c ***/
Index: subversion/libsvn_repos/fs-wrap.c
===================================================================
--- subversion/libsvn_repos/fs-wrap.c (revision 1140505)
+++ subversion/libsvn_repos/fs-wrap.c (working copy)
@@ -676,12 +676,12 @@
apr_pool_t *pool)
{
return svn_error_trace(svn_repos_fs_get_mergeinfo2(mergeinfo, repos,
- paths, rev, inherit,
- FALSE,
- include_descendants,
- authz_read_func,
- authz_read_baton,
- pool));
+ paths, rev, inherit,
+ FALSE,
+ include_descendants,
+ authz_read_func,
+ authz_read_baton,
+ pool));
}
struct pack_notify_baton
Index: subversion/libsvn_fs_fs/tree.c
===================================================================
--- subversion/libsvn_fs_fs/tree.c (revision 1140505)
+++ subversion/libsvn_fs_fs/tree.c (working copy)
@@ -2110,7 +2110,7 @@
apr_pool_t *pool)
{
return svn_error_trace(copy_helper(from_root, from_path, to_root, to_path,
- TRUE, pool));
+ TRUE, pool));
}
@@ -2127,7 +2127,7 @@
return SVN_FS__NOT_TXN(to_root);
return svn_error_trace(copy_helper(from_root, path, to_root, path,
- FALSE, pool));
+ FALSE, pool));
}
Received on 2011-06-28 13:03:04 CEST