Author: julianfoad
Date: Fri Jun 24 14:40:26 2011
New Revision: 1139332
URL: http://svn.apache.org/viewvc?rev=1139332&view=rev
Log:
Remove redundant svn_error_trace() wrappers. These are places where
svn_error_trace() is wrapped around an error creation macro that already
traces its location. Don't touch the places where this is done on purpose in
error-test.c.
* subversion/libsvn_client/merge.c
(merge_peg_locked): Remove a redundant svn_error_trace() wrapper.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__hotcopy): Same.
* subversion/svn/commit-cmd.c
(svn_cl__commit): Same.
* subversion/svn/merge-cmd.c
(svn_cl__merge): Same.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/svn/commit-cmd.c
subversion/trunk/subversion/svn/merge-cmd.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1139332&r1=1139331&r2=1139332&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jun 24 14:40:26 2011
@@ -10698,10 +10698,9 @@ merge_peg_locked(const char *source,
SVN_ERR(svn_wc_read_kind(&target_kind, ctx->wc_ctx, target_abspath, FALSE,
scratch_pool));
if (target_kind != svn_node_dir && target_kind != svn_node_file)
- return svn_error_trace(svn_error_createf(
- SVN_ERR_ILLEGAL_TARGET, NULL,
- _("Merge target '%s' does not exist in the "
- "working copy"), target_abspath));
+ return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+ _("Merge target '%s' does not exist in the "
+ "working copy"), target_abspath);
SVN_ERR(ensure_wc_is_suitable_merge_target(target_abspath, ctx,
allow_mixed_rev, TRUE, TRUE,
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1139332&r1=1139331&r2=1139332&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Fri Jun 24 14:40:26 2011
@@ -1580,7 +1580,7 @@ svn_fs_fs__hotcopy(const char *src_path,
"repository. Please create this file, for "
"instance by running 'svnadmin upgrade
%s'"),
dst_abspath, config_relpath, src_abspath);
- return svn_error_trace(svn_error_quick_wrap(err, msg));
+ return svn_error_quick_wrap(err, msg);
}
else
return svn_error_trace(err);
Modified: subversion/trunk/subversion/svn/commit-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/commit-cmd.c?rev=1139332&r1=1139331&r2=1139332&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/commit-cmd.c (original)
+++ subversion/trunk/subversion/svn/commit-cmd.c Fri Jun 24 14:40:26 2011
@@ -117,10 +117,9 @@ svn_cl__commit(apr_getopt_t *os,
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
if (svn_path_is_url(target))
- return svn_error_trace(
- svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("'%s' is a URL, but URLs cannot be "
- "commit targets"), target));
+ return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("'%s' is a URL, but URLs cannot be "
+ "commit targets"), target);
}
/* Add "." if user passed 0 arguments. */
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1139332&r1=1139331&r2=1139332&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Fri Jun 24 14:40:26 2011
@@ -342,10 +342,9 @@ svn_cl__merge(apr_getopt_t *os,
else
{
if (svn_path_is_url(sourcepath1) != svn_path_is_url(sourcepath2))
- return svn_error_trace(svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR,
- NULL,
- _("Merge sources must both be
"
- "either paths or URLs")));
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("Merge sources must both be "
+ "either paths or URLs"));
err = svn_client_merge4(sourcepath1,
&first_range_start,
sourcepath2,
