subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1139195 [1/4] - in /subversion/trunk: subversion/include/ subversion/libsvn_client/ subversion/libsvn_diff/ subversion/libsvn_fs/ subversion/libsvn_fs_base/ subversion/libsvn_fs_base/bdb/ subversion/libsvn_fs_fs/ subversion/libsvn_ra/ subv...
Date Fri, 24 Jun 2011 08:09:12 GMT
Author: julianfoad
Date: Fri Jun 24 08:09:09 2011
New Revision: 1139195

URL: http://svn.apache.org/viewvc?rev=1139195&view=rev
Log:
Rename the 'svn_error_return' macro to 'svn_error_trace'.

See email thread "[RFC] Rename 'svn_error_return' to 'svn_error_trace'?" on
2011-06-23, <http://svn.haxx.se/dev/archive-2011-06/0708.shtml>.

* subversion/include/svn_error.h
  (svn_error_return): Rename to svn_error_trace.
  (SVN_ERR, svn_error_purge_tracing): Track the rename.

* [everywhere]: Track the rename.

Modified:
    subversion/trunk/subversion/include/svn_error.h
    subversion/trunk/subversion/libsvn_client/add.c
    subversion/trunk/subversion/libsvn_client/cat.c
    subversion/trunk/subversion/libsvn_client/checkout.c
    subversion/trunk/subversion/libsvn_client/cleanup.c
    subversion/trunk/subversion/libsvn_client/cmdline.c
    subversion/trunk/subversion/libsvn_client/commit.c
    subversion/trunk/subversion/libsvn_client/commit_util.c
    subversion/trunk/subversion/libsvn_client/copy.c
    subversion/trunk/subversion/libsvn_client/delete.c
    subversion/trunk/subversion/libsvn_client/deprecated.c
    subversion/trunk/subversion/libsvn_client/diff.c
    subversion/trunk/subversion/libsvn_client/export.c
    subversion/trunk/subversion/libsvn_client/externals.c
    subversion/trunk/subversion/libsvn_client/info.c
    subversion/trunk/subversion/libsvn_client/list.c
    subversion/trunk/subversion/libsvn_client/log.c
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/libsvn_client/mergeinfo.c
    subversion/trunk/subversion/libsvn_client/patch.c
    subversion/trunk/subversion/libsvn_client/prop_commands.c
    subversion/trunk/subversion/libsvn_client/ra.c
    subversion/trunk/subversion/libsvn_client/relocate.c
    subversion/trunk/subversion/libsvn_client/repos_diff.c
    subversion/trunk/subversion/libsvn_client/revert.c
    subversion/trunk/subversion/libsvn_client/switch.c
    subversion/trunk/subversion/libsvn_client/update.c
    subversion/trunk/subversion/libsvn_client/url.c
    subversion/trunk/subversion/libsvn_client/util.c
    subversion/trunk/subversion/libsvn_diff/parse-diff.c
    subversion/trunk/subversion/libsvn_fs/fs-loader.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/bdb-err.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/env.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/locks-table.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/txn-table.c
    subversion/trunk/subversion/libsvn_fs_base/dag.c
    subversion/trunk/subversion/libsvn_fs_base/fs.c
    subversion/trunk/subversion/libsvn_fs_base/lock.c
    subversion/trunk/subversion/libsvn_fs_base/reps-strings.c
    subversion/trunk/subversion/libsvn_fs_base/revs-txns.c
    subversion/trunk/subversion/libsvn_fs_base/tree.c
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
    subversion/trunk/subversion/libsvn_fs_fs/lock.c
    subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c
    subversion/trunk/subversion/libsvn_fs_fs/tree.c
    subversion/trunk/subversion/libsvn_ra/deprecated.c
    subversion/trunk/subversion/libsvn_ra_neon/commit.c
    subversion/trunk/subversion/libsvn_ra_neon/lock.c
    subversion/trunk/subversion/libsvn_ra_serf/blame.c
    subversion/trunk/subversion/libsvn_ra_serf/property.c
    subversion/trunk/subversion/libsvn_ra_serf/serf.c
    subversion/trunk/subversion/libsvn_ra_serf/update.c
    subversion/trunk/subversion/libsvn_ra_serf/util.c
    subversion/trunk/subversion/libsvn_repos/commit.c
    subversion/trunk/subversion/libsvn_repos/deprecated.c
    subversion/trunk/subversion/libsvn_repos/dump.c
    subversion/trunk/subversion/libsvn_repos/fs-wrap.c
    subversion/trunk/subversion/libsvn_repos/hooks.c
    subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
    subversion/trunk/subversion/libsvn_repos/load.c
    subversion/trunk/subversion/libsvn_repos/log.c
    subversion/trunk/subversion/libsvn_repos/reporter.c
    subversion/trunk/subversion/libsvn_repos/repos.c
    subversion/trunk/subversion/libsvn_repos/rev_hunt.c
    subversion/trunk/subversion/libsvn_subr/deprecated.c
    subversion/trunk/subversion/libsvn_subr/io.c
    subversion/trunk/subversion/libsvn_subr/magic.c
    subversion/trunk/subversion/libsvn_subr/skel.c
    subversion/trunk/subversion/libsvn_subr/sqlite.c
    subversion/trunk/subversion/libsvn_subr/stream.c
    subversion/trunk/subversion/libsvn_subr/subst.c
    subversion/trunk/subversion/libsvn_subr/svn_string.c
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c
    subversion/trunk/subversion/libsvn_wc/adm_files.c
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/conflicts.c
    subversion/trunk/subversion/libsvn_wc/copy.c
    subversion/trunk/subversion/libsvn_wc/crop.c
    subversion/trunk/subversion/libsvn_wc/deprecated.c
    subversion/trunk/subversion/libsvn_wc/entries.c
    subversion/trunk/subversion/libsvn_wc/externals.c
    subversion/trunk/subversion/libsvn_wc/info.c
    subversion/trunk/subversion/libsvn_wc/lock.c
    subversion/trunk/subversion/libsvn_wc/node.c
    subversion/trunk/subversion/libsvn_wc/props.c
    subversion/trunk/subversion/libsvn_wc/questions.c
    subversion/trunk/subversion/libsvn_wc/relocate.c
    subversion/trunk/subversion/libsvn_wc/status.c
    subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c
    subversion/trunk/subversion/libsvn_wc/upgrade.c
    subversion/trunk/subversion/libsvn_wc/wc_db.c
    subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
    subversion/trunk/subversion/libsvn_wc/wc_db_util.c
    subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/trunk/subversion/libsvn_wc/workqueue.c
    subversion/trunk/subversion/svn/blame-cmd.c
    subversion/trunk/subversion/svn/commit-cmd.c
    subversion/trunk/subversion/svn/conflict-callbacks.c
    subversion/trunk/subversion/svn/copy-cmd.c
    subversion/trunk/subversion/svn/delete-cmd.c
    subversion/trunk/subversion/svn/export-cmd.c
    subversion/trunk/subversion/svn/info-cmd.c
    subversion/trunk/subversion/svn/list-cmd.c
    subversion/trunk/subversion/svn/log-cmd.c
    subversion/trunk/subversion/svn/merge-cmd.c
    subversion/trunk/subversion/svn/mkdir-cmd.c
    subversion/trunk/subversion/svn/move-cmd.c
    subversion/trunk/subversion/svn/propedit-cmd.c
    subversion/trunk/subversion/svn/revert-cmd.c
    subversion/trunk/subversion/svn/unlock-cmd.c
    subversion/trunk/subversion/svn/util.c
    subversion/trunk/subversion/svnadmin/main.c
    subversion/trunk/subversion/svnsync/main.c
    subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c
    subversion/trunk/subversion/tests/cmdline/entries-dump.c
    subversion/trunk/subversion/tests/libsvn_subr/error-test.c
    subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
    subversion/trunk/tools/server-side/svn-rep-sharing-stats.c

Modified: subversion/trunk/subversion/include/svn_error.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error.h?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_error.h (original)
+++ subversion/trunk/subversion/include/svn_error.h Fri Jun 24 08:09:09 2011
@@ -302,7 +302,7 @@ svn_handle_warning(FILE *stream,
   do {                                          \
     svn_error_t *svn_err__temp = (expr);        \
     if (svn_err__temp)                          \
-      return svn_error_return(svn_err__temp);   \
+      return svn_error_trace(svn_err__temp);    \
   } while (0)
 
 /**
@@ -317,9 +317,9 @@ svn_handle_warning(FILE *stream,
 #ifdef SVN_ERR__TRACING
 #define SVN_ERR__TRACED "traced call"
 
-#define svn_error_return(expr)  svn_error_quick_wrap((expr), SVN_ERR__TRACED)
+#define svn_error_trace(expr)  svn_error_quick_wrap((expr), SVN_ERR__TRACED)
 #else
-#define svn_error_return(expr)  (expr)
+#define svn_error_trace(expr)  (expr)
 #endif
 
 /**
@@ -441,7 +441,7 @@ svn_error_t *svn_error_purge_tracing(svn
  */
 #define SVN_ERR_MALFUNCTION()                                      \
   do {                                                             \
-    return svn_error_return(svn_error__malfunction(                \
+    return svn_error_trace(svn_error__malfunction(                 \
                                  TRUE, __FILE__, __LINE__, NULL)); \
   } while (0)
 

Modified: subversion/trunk/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/add.c (original)
+++ subversion/trunk/subversion/libsvn_client/add.c Fri Jun 24 08:09:09 2011
@@ -367,7 +367,7 @@ add_file(const char *local_abspath,
                                              NULL /* changelists */,
                                              NULL, NULL, NULL, NULL,
                                              pool));
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
         }
     }
@@ -429,7 +429,7 @@ add_dir_recursive(const char *dir_abspat
   if (err && err->apr_err == SVN_ERR_ENTRY_EXISTS && force)
     svn_error_clear(err);
   else if (err)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   if (!no_ignore)
     {
@@ -607,7 +607,7 @@ add(void *baton, apr_pool_t *result_pool
       svn_error_clear(err);
       err = SVN_NO_ERROR;
     }
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 
@@ -902,7 +902,7 @@ mkdir_urls(const apr_array_header_t *url
     {
       /* At least try to abort the edit (and fs txn) before throwing err. */
       svn_error_clear(editor->abort_edit(edit_baton, pool));
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
 
   /* Close the edit. */
@@ -943,7 +943,7 @@ svn_client__make_local_parents(const cha
       svn_error_clear(svn_io_remove_dir2(path, FALSE, NULL, NULL, pool));
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 

Modified: subversion/trunk/subversion/libsvn_client/cat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cat.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cat.c (original)
+++ subversion/trunk/subversion/libsvn_client/cat.c Fri Jun 24 08:09:09 2011
@@ -218,7 +218,7 @@ svn_client_cat2(svn_stream_t *out,
       /* We don't promise to close output, so disown it to ensure we don't. */
       output = svn_stream_disown(output, pool);
 
-      return svn_error_return(svn_stream_copy3(normal_stream, output,
+      return svn_error_trace(svn_stream_copy3(normal_stream, output,
                                                ctx->cancel_func,
                                                ctx->cancel_baton, pool));
     }
@@ -241,7 +241,7 @@ svn_client_cat2(svn_stream_t *out,
         }
       else
         {
-          return svn_error_return(err);
+          return svn_error_trace(err);
         }
     }
 

Modified: subversion/trunk/subversion/libsvn_client/checkout.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/checkout.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/checkout.c (original)
+++ subversion/trunk/subversion/libsvn_client/checkout.c Fri Jun 24 08:09:09 2011
@@ -226,7 +226,7 @@ svn_client__checkout_internal(svn_revnum
       /* Don't rely on the error handling to handle the sleep later, do
          it now */
       svn_io_sleep_for_timestamps(local_abspath, pool);
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
   *use_sleep = TRUE;
 

Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Fri Jun 24 08:09:09 2011
@@ -60,7 +60,7 @@ svn_client_cleanup(const char *path,
   err = svn_wc_cleanup3(ctx->wc_ctx, local_abspath, ctx->cancel_func,
                         ctx->cancel_baton, scratch_pool);
   svn_io_sleep_for_timestamps(path, scratch_pool);
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 

Modified: subversion/trunk/subversion/libsvn_client/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cmdline.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_client/cmdline.c Fri Jun 24 08:09:09 2011
@@ -139,7 +139,7 @@ check_root_url_of_target(const char **ro
           return SVN_NO_ERROR;
         }
       else
-        return svn_error_return(err);
+        return svn_error_trace(err);
      }
 
    if (*root_url != NULL)
@@ -401,5 +401,5 @@ svn_client_args_to_target_array2(apr_arr
                               _("'%s' ends in a reserved name"),
                               APR_ARRAY_IDX(reserved_names, i, const char *));
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Fri Jun 24 08:09:09 2011
@@ -165,7 +165,7 @@ send_file_contents(const char *path,
     }
 
   /* Send the file's contents to the delta-window handler. */
-  return svn_error_return(svn_txdelta_send_stream(contents, handler,
+  return svn_error_trace(svn_txdelta_send_stream(contents, handler,
                                                   handler_baton, digest,
                                                   pool));
 }
@@ -1061,7 +1061,7 @@ determine_lock_targets(apr_array_header_
               svn_error_clear(err);
               continue;
             }
-          return svn_error_return(err);
+          return svn_error_trace(err);
         }
 
       wc_targets = apr_hash_get(wc_items, wcroot_abspath, APR_HASH_KEY_STRING);
@@ -1165,7 +1165,7 @@ check_url_kind(void *baton,
   else
     SVN_ERR(svn_ra_reparent(cukb->session, url, scratch_pool));
 
-  return svn_error_return(
+  return svn_error_trace(
                 svn_ra_check_path(cukb->session, "", revision,
                                   kind, scratch_pool));
 }
@@ -1248,7 +1248,7 @@ svn_client_commit5(const apr_array_heade
 
       svn_pool_clear(iterpool);
 
-      cmt_err = svn_error_return(
+      cmt_err = svn_error_trace(
                     svn_wc__acquire_write_lock(&lock_root, ctx->wc_ctx, target,
                                            FALSE, pool, iterpool));
 
@@ -1276,7 +1276,7 @@ svn_client_commit5(const apr_array_heade
 
         target_abspath = svn_dirent_join(base_abspath, relpath, iterpool);
 
-        cmt_err = svn_error_return(
+        cmt_err = svn_error_trace(
           check_nonrecursive_dir_delete(ctx->wc_ctx, target_abspath,
                                         depth, iterpool));
 
@@ -1294,7 +1294,7 @@ svn_client_commit5(const apr_array_heade
     cukb.repos_root_url = NULL;
     cukb.ctx = ctx;
 
-    cmt_err = svn_error_return(
+    cmt_err = svn_error_trace(
                    svn_client__harvest_committables(&committables,
                                                     &lock_tokens,
                                                     base_abspath,
@@ -1361,7 +1361,7 @@ svn_client_commit5(const apr_array_heade
   if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx))
     {
       const char *tmp_file;
-      cmt_err = svn_error_return(
+      cmt_err = svn_error_trace(
                      svn_client__get_log_msg(&log_msg, &tmp_file, commit_items,
                                              ctx, pool));
 
@@ -1372,7 +1372,7 @@ svn_client_commit5(const apr_array_heade
     log_msg = "";
 
   /* Sort and condense our COMMIT_ITEMS. */
-  cmt_err = svn_error_return(svn_client__condense_commit_items(&base_url,
+  cmt_err = svn_error_trace(svn_client__condense_commit_items(&base_url,
                                                                commit_items,
                                                                pool));
 
@@ -1380,7 +1380,7 @@ svn_client_commit5(const apr_array_heade
     goto cleanup;
 
   /* Collect our lock tokens with paths relative to base_url. */
-  cmt_err = svn_error_return(collect_lock_tokens(&lock_tokens, lock_tokens,
+  cmt_err = svn_error_trace(collect_lock_tokens(&lock_tokens, lock_tokens,
                                                  base_url, pool));
 
   if (cmt_err)
@@ -1391,7 +1391,7 @@ svn_client_commit5(const apr_array_heade
   cb.info = &commit_info;
   cb.pool = pool;
 
-  cmt_err = svn_error_return(
+  cmt_err = svn_error_trace(
                  get_ra_editor(&ra_session, &editor, &edit_baton, ctx,
                                base_url, base_abspath, log_msg,
                                commit_items, revprop_table, TRUE, lock_tokens,
@@ -1405,7 +1405,7 @@ svn_client_commit5(const apr_array_heade
   commit_in_progress = TRUE;
 
   /* Perform the commit. */
-  cmt_err = svn_error_return(
+  cmt_err = svn_error_trace(
             svn_client__do_commit(base_url, commit_items, editor, edit_baton,
                                   notify_prefix, NULL,
                                   &sha1_checksums, ctx, pool, iterpool));
@@ -1478,6 +1478,6 @@ svn_client_commit5(const apr_array_heade
 
   svn_pool_destroy(iterpool);
 
-  return svn_error_return(reconcile_errors(cmt_err, unlock_err, bump_err,
+  return svn_error_trace(reconcile_errors(cmt_err, unlock_err, bump_err,
                                            pool));
 }

Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri Jun 24 08:09:09 2011
@@ -1550,10 +1550,10 @@ do_item_commit(void **dir_baton,
                                  parent_baton, pool);
 
       if (err)
-        return svn_error_return(fixup_commit_error(local_abspath,
-                                                   icb->base_url,
-                                                   path, item->kind,
-                                                   err, ctx, pool));
+        return svn_error_trace(fixup_commit_error(local_abspath,
+                                                  icb->base_url,
+                                                  path, item->kind,
+                                                  err, ctx, pool));
     }
 
   /* If this item is supposed to be added, do so. */
@@ -1577,10 +1577,10 @@ do_item_commit(void **dir_baton,
         }
 
       if (err)
-        return svn_error_return(fixup_commit_error(local_abspath,
-                                                   icb->base_url,
-                                                   path, kind, err,
-                                                   ctx, pool));
+        return svn_error_trace(fixup_commit_error(local_abspath,
+                                                  icb->base_url,
+                                                  path, kind, err,
+                                                  ctx, pool));
 
       /* Set other prop-changes, if available in the baton */
       if (item->outgoing_prop_changes)
@@ -1618,11 +1618,11 @@ do_item_commit(void **dir_baton,
                                       file_pool, &file_baton);
 
               if (err)
-                return svn_error_return(fixup_commit_error(local_abspath,
-                                                           icb->base_url,
-                                                           path, kind,
-                                                           err, ctx,
-                                                           pool));
+                return svn_error_trace(fixup_commit_error(local_abspath,
+                                                          icb->base_url,
+                                                          path, kind,
+                                                          err, ctx,
+                                                          pool));
             }
         }
       else
@@ -1642,11 +1642,11 @@ do_item_commit(void **dir_baton,
                 }
 
               if (err)
-                return svn_error_return(fixup_commit_error(local_abspath,
-                                                           icb->base_url,
-                                                           path, kind,
-                                                           err, ctx,
-                                                           pool));
+                return svn_error_trace(fixup_commit_error(local_abspath,
+                                                          icb->base_url,
+                                                          path, kind,
+                                                          err, ctx,
+                                                          pool));
             }
         }
 
@@ -1659,10 +1659,10 @@ do_item_commit(void **dir_baton,
               (kind == svn_node_dir) ? *dir_baton : file_baton, pool);
 
       if (err)
-        return svn_error_return(fixup_commit_error(local_abspath,
-                                                   icb->base_url,
-                                                   path, kind, err,
-                                                   ctx, pool));
+        return svn_error_trace(fixup_commit_error(local_abspath,
+                                                  icb->base_url,
+                                                  path, kind, err,
+                                                  ctx, pool));
 
       /* Make any additional client -> repository prop changes. */
       if (item->outgoing_prop_changes)
@@ -1704,10 +1704,10 @@ do_item_commit(void **dir_baton,
                                     file_pool, &file_baton);
 
           if (err)
-            return svn_error_return(fixup_commit_error(local_abspath,
-                                                       icb->base_url,
-                                                       path, kind,
-                                                       err, ctx, pool));
+            return svn_error_trace(fixup_commit_error(local_abspath,
+                                                      icb->base_url,
+                                                      path, kind,
+                                                      err, ctx, pool));
         }
 
       /* Add this file mod to the FILE_MODS hash. */
@@ -1722,10 +1722,10 @@ do_item_commit(void **dir_baton,
       err = editor->close_file(file_baton, NULL, file_pool);
 
       if (err)
-        return svn_error_return(fixup_commit_error(local_abspath,
-                                                   icb->base_url,
-                                                   path, kind,
-                                                   err, ctx, pool));
+        return svn_error_trace(fixup_commit_error(local_abspath,
+                                                  icb->base_url,
+                                                  path, kind,
+                                                  err, ctx, pool));
     }
 
   return SVN_NO_ERROR;
@@ -1844,11 +1844,11 @@ svn_client__do_commit(const char *base_u
                                          result_pool, iterpool);
 
       if (err)
-        return svn_error_return(fixup_commit_error(item->path,
-                                                   base_url,
-                                                   item->session_relpath,
-                                                   svn_node_file,
-                                                   err, ctx, iterpool));
+        return svn_error_trace(fixup_commit_error(item->path,
+                                                  base_url,
+                                                  item->session_relpath,
+                                                  svn_node_file,
+                                                  err, ctx, iterpool));
 
       if (md5_checksums)
         apr_hash_set(*md5_checksums, item->path, APR_HASH_KEY_STRING,
@@ -1861,7 +1861,7 @@ svn_client__do_commit(const char *base_u
   svn_pool_destroy(iterpool);
 
   /* Close the edit. */
-  return svn_error_return(editor->close_edit(edit_baton, scratch_pool));
+  return svn_error_trace(editor->close_edit(edit_baton, scratch_pool));
 }
 
 

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Fri Jun 24 08:09:09 2011
@@ -157,7 +157,7 @@ extend_wc_mergeinfo(const char *target_a
   else if (! wc_mergeinfo)
     wc_mergeinfo = mergeinfo;
 
-  return svn_error_return(
+  return svn_error_trace(
     svn_client__record_wc_mergeinfo(target_abspath, wc_mergeinfo,
                                     FALSE, ctx, pool));
 }
@@ -432,7 +432,7 @@ do_wc_to_wc_moves(const apr_array_header
 
   svn_io_sleep_for_timestamps(dst_path, pool);
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 
@@ -1156,11 +1156,11 @@ repos_to_repos_copy(const apr_array_head
     {
       /* At least try to abort the edit (and fs txn) before throwing err. */
       svn_error_clear(editor->abort_edit(edit_baton, pool));
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
 
   /* Close the edit. */
-  return svn_error_return(editor->close_edit(edit_baton, pool));
+  return svn_error_trace(editor->close_edit(edit_baton, pool));
 }
 
 /* Baton for check_url_kind */
@@ -1749,7 +1749,7 @@ repos_to_wc_copy_locked(const apr_array_
     /* Get the repository uuid of SRC_URL */
     src_err = svn_ra_get_uuid2(ra_session, &src_uuid, scratch_pool);
     if (src_err && src_err->apr_err != SVN_ERR_RA_NO_REPOS_UUID)
-      return svn_error_return(src_err);
+      return svn_error_trace(src_err);
 
     /* Get repository uuid of dst's parent directory, since dst may
        not exist.  ### TODO:  we should probably walk up the wc here,
@@ -2256,26 +2256,26 @@ try_copy(const apr_array_header_t *sourc
 
       /* Copy or move all targets. */
       if (is_move)
-        return svn_error_return(do_wc_to_wc_moves(copy_pairs, dst_path_in, ctx,
+        return svn_error_trace(do_wc_to_wc_moves(copy_pairs, dst_path_in, ctx,
                                                   pool));
       else
-        return svn_error_return(do_wc_to_wc_copies(copy_pairs, ctx, pool));
+        return svn_error_trace(do_wc_to_wc_copies(copy_pairs, ctx, pool));
     }
   else if ((! srcs_are_urls) && (dst_is_url))
     {
-      return svn_error_return(
+      return svn_error_trace(
         wc_to_repos_copy(copy_pairs, make_parents, revprop_table,
                          commit_callback, commit_baton, ctx, pool));
     }
   else if ((srcs_are_urls) && (! dst_is_url))
     {
-      return svn_error_return(
+      return svn_error_trace(
         repos_to_wc_copy(copy_pairs, make_parents, ignore_externals,
                          ctx, pool));
     }
   else
     {
-      return svn_error_return(
+      return svn_error_trace(
         repos_to_repos_copy(copy_pairs, make_parents, revprop_table,
                             commit_callback, commit_baton, ctx, is_move,
                             pool));
@@ -2346,7 +2346,7 @@ svn_client_copy6(const apr_array_header_
     }
 
   svn_pool_destroy(subpool);
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 
@@ -2427,5 +2427,5 @@ svn_client_move6(const apr_array_header_
     }
 
   svn_pool_destroy(subpool);
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }

Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Fri Jun 24 08:09:09 2011
@@ -120,7 +120,7 @@ svn_client__can_delete(const char *path,
      status callback function find_undeletables() makes the
      determination, returning an error if it finds anything that shouldn't
      be deleted. */
-  return svn_error_return(svn_client_status5(NULL, ctx, path, &revision,
+  return svn_error_trace(svn_client_status5(NULL, ctx, path, &revision,
                                              svn_depth_infinity, FALSE,
                                              FALSE, FALSE, FALSE, FALSE,
                                              NULL,
@@ -201,13 +201,13 @@ single_repos_delete(svn_ra_session_t *ra
 
   if (err)
     {
-      return svn_error_return(
+      return svn_error_trace(
                svn_error_compose_create(err,
                                         editor->abort_edit(edit_baton, pool)));
     }
 
   /* Close the edit. */
-  return svn_error_return(editor->close_edit(edit_baton, pool));
+  return svn_error_trace(editor->close_edit(edit_baton, pool));
 }
 
 static svn_error_t *
@@ -321,7 +321,7 @@ svn_client__wc_delete(const char *path,
 
   if (!dry_run)
     /* Mark the entry for commit deletion and perform wc deletion */
-    return svn_error_return(svn_wc_delete4(ctx->wc_ctx, local_abspath,
+    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));

Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Fri Jun 24 08:09:09 2011
@@ -145,7 +145,7 @@ svn_client_mkdir(svn_client_commit_info_
   err = svn_client_mkdir2(&commit_info, paths, ctx, pool);
   /* These structs have the same layout for the common fields. */
   *commit_info_p = (svn_client_commit_info_t *) commit_info;
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 /*** From blame.c ***/
@@ -434,7 +434,7 @@ svn_client_import(svn_client_commit_info
                            FALSE, ctx, pool);
   /* These structs have the same layout for the common fields. */
   *commit_info_p = (svn_client_commit_info_t *) commit_info;
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 
@@ -551,7 +551,7 @@ svn_client_commit2(svn_client_commit_inf
                            ctx, pool);
   /* These structs have the same layout for the common fields. */
   *commit_info_p = (svn_client_commit_info_t *) commit_info;
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 svn_error_t *
@@ -653,7 +653,7 @@ svn_client_copy2(svn_commit_info_t **com
                               ctx, pool);
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 svn_error_t *
@@ -671,7 +671,7 @@ svn_client_copy(svn_client_commit_info_t
                          ctx, pool);
   /* These structs have the same layout for the common fields. */
   *commit_info_p = (svn_client_commit_info_t *) commit_info;
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 svn_error_t *
@@ -739,7 +739,7 @@ svn_client_move3(svn_commit_info_t **com
                               force, ctx, pool);
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 svn_error_t *
@@ -756,7 +756,7 @@ svn_client_move2(svn_client_commit_info_
   err = svn_client_move3(&commit_info, src_path, dst_path, force, ctx, pool);
   /* These structs have the same layout for the common fields. */
   *commit_info_p = (svn_client_commit_info_t *) commit_info;
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 
@@ -830,7 +830,7 @@ svn_client_delete(svn_client_commit_info
   err = svn_client_delete2(&commit_info, paths, force, ctx, pool);
   /* These structs have the same layout for the common fields. */
   *commit_info_p = (svn_client_commit_info_t *) commit_info;
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 /*** From diff.c ***/
@@ -1402,7 +1402,7 @@ svn_client_log(const apr_array_header_t 
                        pool));
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 /*** From merge.c ***/
@@ -1643,7 +1643,7 @@ svn_client_propget3(apr_hash_t **props,
   if (err && err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE)
     {
       err->apr_err = SVN_ERR_ENTRY_NOT_FOUND;
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
   else
     SVN_ERR(err);
@@ -2058,7 +2058,7 @@ svn_client_checkout2(svn_revnum_t *resul
                      svn_client_ctx_t *ctx,
                      apr_pool_t *pool)
 {
-  return svn_error_return(svn_client_checkout3(result_rev, URL, path,
+  return svn_error_trace(svn_client_checkout3(result_rev, URL, path,
                                         peg_revision, revision,
                                         SVN_DEPTH_INFINITY_OR_FILES(recurse),
                                         ignore_externals, FALSE, ctx, pool));
@@ -2077,7 +2077,7 @@ svn_client_checkout(svn_revnum_t *result
 
   peg_revision.kind = svn_opt_revision_unspecified;
 
-  return svn_error_return(svn_client_checkout2(result_rev, URL, path,
+  return svn_error_trace(svn_client_checkout2(result_rev, URL, path,
                                                &peg_revision, revision, recurse,
                                                FALSE, ctx, pool));
 }
@@ -2361,7 +2361,7 @@ svn_client_uuid_from_path(const char **u
   const char *local_abspath;
 
   SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
-  return svn_error_return(
+  return svn_error_trace(
     svn_client_uuid_from_path2(uuid, local_abspath, ctx, pool, pool));
 }
 

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Fri Jun 24 08:09:09 2011
@@ -872,7 +872,7 @@ diff_dir_props_changed(svn_wc_notify_sta
   if (diff_cmd_baton->anchor)
     path = svn_dirent_join(diff_cmd_baton->anchor, path, scratch_pool);
 
-  return svn_error_return(diff_props_changed(state,
+  return svn_error_trace(diff_props_changed(state,
                                              tree_conflicted, path,
                                              dir_was_added,
                                              propchanges,

Modified: subversion/trunk/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Fri Jun 24 08:09:09 2011
@@ -241,7 +241,7 @@ copy_one_versioned_file(const char *from
          details into the destination stream. */
       SVN_ERR(svn_subst_create_specialfile(&dst_stream, to_abspath,
                                            scratch_pool, scratch_pool));
-      return svn_error_return(
+      return svn_error_trace(
         svn_stream_copy3(source, dst_stream, NULL, NULL, scratch_pool));
     }
 
@@ -448,7 +448,7 @@ copy_versioned_files(const char *from_ab
       if (err)
         {
           if (! APR_STATUS_IS_EEXIST(err->apr_err))
-            return svn_error_return(err);
+            return svn_error_trace(err);
           if (! force)
             SVN_ERR_W(err, _("Destination directory exists, and will not be "
                              "overwritten unless forced"));
@@ -843,7 +843,7 @@ window_handler(svn_txdelta_window_t *win
       svn_error_clear(svn_io_remove_file2(hb->tmppath, TRUE, hb->pool));
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Fri Jun 24 08:09:09 2011
@@ -118,7 +118,7 @@ relegate_dir_external(svn_wc_context_t *
       SVN_ERR(svn_io_file_rename(local_abspath, new_path, scratch_pool));
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 /* Try to update a directory external at PATH to URL at REVISION.
@@ -156,7 +156,7 @@ switch_dir_external(const char *local_ab
           goto relegate;
         }
       else if (err)
-        return svn_error_return(err);
+        return svn_error_trace(err);
 
       if (node_url)
         {
@@ -212,7 +212,7 @@ switch_dir_external(const char *local_ab
                       goto relegate;
                     }
                   else if (err)
-                    return svn_error_return(err);
+                    return svn_error_trace(err);
                 }
 
               SVN_ERR(svn_client__switch_internal(NULL, local_abspath, url,
@@ -501,7 +501,7 @@ cleanup:
              svn_wc__release_write_lock(ctx->wc_ctx, dir_abspath, subpool));
 
   svn_pool_destroy(subpool);
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 /* Return the scheme of @a uri in @a scheme allocated from @a pool.
@@ -796,7 +796,7 @@ handle_external_item_removal(const struc
         err = svn_error_compose_create(err, err2);
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 static svn_error_t *

Modified: subversion/trunk/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Fri Jun 24 08:09:09 2011
@@ -292,7 +292,7 @@ svn_client_info3(const char *abspath_or_
     {
       /* Do all digging in the working copy. */
       wc_info_receiver_baton_t b = { receiver, receiver_baton };
-      return svn_error_return(
+      return svn_error_trace(
         svn_wc__get_info(ctx->wc_ctx, abspath_or_url, depth,
                          wc_info_receiver, &b, changelists,
                          ctx->cancel_func, ctx->cancel_baton, pool));
@@ -364,7 +364,7 @@ svn_client_info3(const char *abspath_or_
     }
   else if (err)
     {
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
 
   if (! the_ent)
@@ -394,7 +394,7 @@ svn_client_info3(const char *abspath_or_
           lock = NULL;
         }
       else if (err)
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
   else
     lock = NULL;
@@ -424,7 +424,7 @@ pre_1_2_recurse:
               locks = apr_hash_make(pool); /* use an empty hash */
             }
           else if (err)
-            return svn_error_return(err);
+            return svn_error_trace(err);
         }
       else
         locks = apr_hash_make(pool); /* use an empty hash */

Modified: subversion/trunk/subversion/libsvn_client/list.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/list.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/list.c (original)
+++ subversion/trunk/subversion/libsvn_client/list.c Fri Jun 24 08:09:09 2011
@@ -238,7 +238,7 @@ svn_client_list2(const char *path_or_url
         dirent = NULL;
     }
   else if (err)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   if (! dirent)
     return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
@@ -258,7 +258,7 @@ svn_client_list2(const char *path_or_url
           locks = NULL;
         }
       else if (err)
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
   else
     locks = NULL;

Modified: subversion/trunk/subversion/libsvn_client/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/log.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/log.c (original)
+++ subversion/trunk/subversion/libsvn_client/log.c Fri Jun 24 08:09:09 2011
@@ -137,7 +137,7 @@ svn_client__get_copy_source(const char *
             *copyfrom_path = NULL;
             *copyfrom_rev = SVN_INVALID_REVNUM;
         }
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
 
   *copyfrom_path = copyfrom_info.path;

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jun 24 08:09:09 2011
@@ -804,7 +804,7 @@ filter_self_referential_mergeinfo(apr_ar
      filtering doesn't apply if we are trying to remove mergeinfo
      entirely.  */
   if (! same_repos)
-    return svn_error_return(omit_mergeinfo_changes(props, *props, pool));
+    return svn_error_trace(omit_mergeinfo_changes(props, *props, pool));
 
   /* If we aren't honoring mergeinfo and this is a merge from the
      same repository, then get outta here.  If this is a reintegrate
@@ -876,7 +876,7 @@ filter_self_referential_mergeinfo(apr_ar
             }
           else
             {
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
         }
 
@@ -998,7 +998,7 @@ filter_self_referential_mergeinfo(apr_ar
                         }
                       else
                         {
-                          return svn_error_return(err2);
+                          return svn_error_trace(err2);
                         }
                      }
                   else
@@ -1222,7 +1222,7 @@ merge_props_changed(svn_wc_notify_state_
           return SVN_NO_ERROR;
         }
       else if (err)
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
 
   return SVN_NO_ERROR;
@@ -1261,7 +1261,7 @@ merge_dir_props_changed(svn_wc_notify_st
       return SVN_NO_ERROR; /* We can't do a real prop merge for added dirs */
     }
 
-  return svn_error_return(merge_props_changed(state,
+  return svn_error_trace(merge_props_changed(state,
                                               tree_conflicted,
                                               local_abspath,
                                               propchanges,
@@ -1327,7 +1327,7 @@ conflict_resolver(svn_wc_conflict_result
                    APR_HASH_KEY_STRING, conflicted_path);
     }
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 /* An svn_wc_diff_callbacks4_t function. */
@@ -2939,7 +2939,7 @@ adjust_deleted_subtree_ranges(svn_client
         }
       else
         {
-          return svn_error_return(err);
+          return svn_error_trace(err);
         }
     }
   else /* PRIMARY_URL@peg_rev exists. */
@@ -3959,7 +3959,7 @@ calculate_remaining_ranges(svn_client__m
               || err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES)
             svn_error_clear(err);
           else
-            return svn_error_return(err);
+            return svn_error_trace(err);
         }
       else
         {
@@ -4499,7 +4499,7 @@ update_wc_mergeinfo(svn_mergeinfo_catalo
             }
           else
             {
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
         }
 
@@ -5692,7 +5692,7 @@ get_mergeinfo_paths(apr_array_header_t *
                       "mergetracking not possible"),
                     svn_dirent_local_style(wc_path, scratch_pool));
                 }
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
           /* Stash this child's pre-existing mergeinfo. */
           mergeinfo_child->pre_merge_mergeinfo = child_pre_merge_mergeinfo;
@@ -6756,7 +6756,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
                   "mergetracking not possible"),
                 svn_dirent_local_style(target_abspath, scratch_pool));
             }
-          return svn_error_return(err);
+          return svn_error_trace(err);
         }
 
       SVN_ERR(svn_ra_reparent(merge_b->ra_session1, url1, iterpool));
@@ -9345,7 +9345,7 @@ merge_locked(const char *source1,
               if (use_sleep)
                 svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
 
           /* Close our temporary RA sessions (this could've happened
@@ -9381,7 +9381,7 @@ merge_locked(const char *source1,
     svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 
   if (err)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   return SVN_NO_ERROR;
 }
@@ -10048,7 +10048,7 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
                 }
               else
                 {
-                  return svn_error_return(err);
+                  return svn_error_trace(err);
                 }
             }
           else
@@ -10242,7 +10242,7 @@ calculate_left_hand_side(const char **ur
                   "reintegrate merge not possible"),
                 svn_dirent_local_style(absolute_path, scratch_pool));
             }
-          return svn_error_return(err);
+          return svn_error_trace(err);
         }
 
       /* Convert the absolute path with mergeinfo on it to a path relative
@@ -10588,7 +10588,7 @@ merge_reintegrate_locked(const char *sou
     svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 
   if (err)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   return SVN_NO_ERROR;
 }
@@ -10698,7 +10698,7 @@ 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_return(svn_error_createf(
+    return svn_error_trace(svn_error_createf(
                               SVN_ERR_ILLEGAL_TARGET, NULL,
                               _("Merge target '%s' does not exist in the "
                                 "working copy"), target_abspath));
@@ -10752,7 +10752,7 @@ merge_peg_locked(const char *source,
     svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 
   if (err)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Jun 24 08:09:09 2011
@@ -494,7 +494,7 @@ svn_client__get_repos_mergeinfo_catalog(
           repos_mergeinfo = NULL;
         }
       else
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
 
   *mergeinfo_cat = repos_mergeinfo;
@@ -924,7 +924,7 @@ svn_client__elide_mergeinfo(const char *
             }
           else
             {
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
         }
 
@@ -949,7 +949,7 @@ svn_client__elide_mergeinfo(const char *
             }
           else
             {
-              return svn_error_return(err);
+              return svn_error_trace(err);
             }
         }
 
@@ -973,7 +973,7 @@ svn_client__elide_mergeinfo(const char *
                 }
               else
                 {
-                  return svn_error_return(err);
+                  return svn_error_trace(err);
                 }
             }
         }

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Fri Jun 24 08:09:09 2011
@@ -438,7 +438,7 @@ resolve_target_path(patch_target_t *targ
       if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
         svn_error_clear(err);
       else
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
   else if (status->node_status == svn_wc_status_ignored ||
            status->node_status == svn_wc_status_unversioned ||
@@ -462,7 +462,7 @@ resolve_target_path(patch_target_t *targ
           target->locally_deleted = FALSE;
         }
       else
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
   SVN_ERR(svn_wc_read_kind(&target->db_kind, wc_ctx, target->local_abspath,
                            FALSE, scratch_pool));
@@ -644,7 +644,7 @@ init_prop_target(prop_patch_target_t **p
           value = NULL;
         }
       else
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
   content->existed = (value != NULL);
   new_prop_target->value = value;
@@ -2528,7 +2528,7 @@ install_patched_prop_targets(patch_targe
                 }
             }
           else
-            return svn_error_return(err);
+            return svn_error_trace(err);
         }
 
     }
@@ -2982,7 +2982,7 @@ svn_client_patch(const char *patch_abspa
   baton.patch_func = patch_func;
   baton.patch_baton = patch_baton;
 
-  return svn_error_return(
+  return svn_error_trace(
            svn_wc__call_with_write_lock(apply_patches, &baton,
                                         ctx->wc_ctx, local_abspath, FALSE,
                                         result_pool, scratch_pool));

Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Fri Jun 24 08:09:09 2011
@@ -241,7 +241,7 @@ propset_on_url(const char *propname,
     {
       /* At least try to abort the edit (and fs txn) before throwing err. */
       svn_error_clear(editor->abort_edit(edit_baton, pool));
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
 
   /* Close the edit. */
@@ -585,7 +585,7 @@ pristine_or_working_props(apr_hash_t **p
 {
   if (pristine)
     {
-      return svn_error_return(svn_wc_get_pristine_props(props,
+      return svn_error_trace(svn_wc_get_pristine_props(props,
                                                         wc_ctx,
                                                         local_abspath,
                                                         result_pool,
@@ -606,7 +606,7 @@ pristine_or_working_props(apr_hash_t **p
       }
   }
 
-  return svn_error_return(svn_wc_prop_list2(props, wc_ctx, local_abspath,
+  return svn_error_trace(svn_wc_prop_list2(props, wc_ctx, local_abspath,
                                             result_pool, scratch_pool));
 }
 
@@ -857,7 +857,7 @@ svn_client_propget4(apr_hash_t **props,
           revnum = SVN_INVALID_REVNUM;
         }
       else if (err)
-        return svn_error_return(err);
+        return svn_error_trace(err);
 
       SVN_ERR(get_prop_from_wc(*props, propname, target,
                                pristine, kind,
@@ -1092,7 +1092,7 @@ recursive_proplist_receiver(void *baton,
   else
     path = local_abspath;
 
-  return svn_error_return(b->wrapped_receiver(b->wrapped_receiver_baton,
+  return svn_error_trace(b->wrapped_receiver(b->wrapped_receiver_baton,
                                               path, props, scratch_pool));
 }
 

Modified: subversion/trunk/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Fri Jun 24 08:09:09 2011
@@ -74,7 +74,7 @@ open_tmp_file(apr_file_t **fp,
               void *callback_baton,
               apr_pool_t *pool)
 {
-  return svn_error_return(svn_io_open_unique_file3(fp, NULL, NULL,
+  return svn_error_trace(svn_io_open_unique_file3(fp, NULL, NULL,
                                   svn_io_file_del_on_pool_cleanup,
                                   pool, pool));
 }
@@ -107,7 +107,7 @@ get_wc_prop(void *baton,
           if (! strcmp(relpath, item->session_relpath))
             {
               SVN_ERR_ASSERT(svn_dirent_is_absolute(item->path));
-              return svn_error_return(svn_wc_prop_get2(value, cb->ctx->wc_ctx,
+              return svn_error_trace(svn_wc_prop_get2(value, cb->ctx->wc_ctx,
                                                        item->path, name,
                                                        pool, pool));
             }
@@ -122,7 +122,7 @@ get_wc_prop(void *baton,
 
   local_abspath = svn_dirent_join(cb->base_dir_abspath, relpath, pool);
 
-  return svn_error_return(svn_wc_prop_get2(value, cb->ctx->wc_ctx,
+  return svn_error_trace(svn_wc_prop_get2(value, cb->ctx->wc_ctx,
                                            local_abspath, name, pool, pool));
 }
 
@@ -193,7 +193,7 @@ set_wc_prop(void *baton,
      right, but the conflict would remind the user to make sure.
      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_return(svn_wc_prop_set4(cb->ctx->wc_ctx, local_abspath,
+  return svn_error_trace(svn_wc_prop_set4(cb->ctx->wc_ctx, local_abspath,
                                            name,
                                            value, svn_depth_empty,
                                            TRUE /* skip_checks */,
@@ -224,7 +224,7 @@ invalidate_wc_props(void *baton,
      the cache altogether anyway, there's little to lose in wiping the
      whole cache.  Is it the most well-behaved approach to take?  Not
      so much.  We choose not to care.  */
-  return svn_error_return(svn_wc__node_clear_dav_cache_recursive(
+  return svn_error_trace(svn_wc__node_clear_dav_cache_recursive(
                               cb->ctx->wc_ctx, local_abspath, pool));
 }
 
@@ -233,7 +233,7 @@ static svn_error_t *
 cancel_callback(void *baton)
 {
   callback_baton_t *b = baton;
-  return svn_error_return((b->ctx->cancel_func)(b->ctx->cancel_baton));
+  return svn_error_trace((b->ctx->cancel_func)(b->ctx->cancel_baton));
 }
 
 
@@ -367,7 +367,7 @@ svn_client_open_ra_session(svn_ra_sessio
                            svn_client_ctx_t *ctx,
                            apr_pool_t *pool)
 {
-  return svn_error_return(
+  return svn_error_trace(
              svn_client__open_ra_session_internal(session, NULL, url,
                                                   NULL, NULL, FALSE, TRUE,
                                                   ctx, pool));
@@ -405,7 +405,7 @@ svn_client_uuid_from_path2(const char **
                            apr_pool_t *result_pool,
                            apr_pool_t *scratch_pool)
 {
-  return svn_error_return(
+  return svn_error_trace(
     svn_wc__node_get_repos_info(NULL, uuid, ctx->wc_ctx, local_abspath,
                                 result_pool, scratch_pool));
 }

Modified: subversion/trunk/subversion/libsvn_client/relocate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/relocate.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_client/relocate.c Fri Jun 24 08:09:09 2011
@@ -241,7 +241,7 @@ svn_client_relocate2(const char *wcroot_
   /* If we're ignoring externals, just relocate and get outta here. */
   if (ignore_externals)
     {
-      return svn_error_return(svn_wc_relocate4(ctx->wc_ctx, local_abspath,
+      return svn_error_trace(svn_wc_relocate4(ctx->wc_ctx, local_abspath,
                                                from_prefix, to_prefix,
                                                validator_func, &vb, pool));
     }

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Fri Jun 24 08:09:09 2011
@@ -912,7 +912,7 @@ apply_textdelta(void *file_baton,
                                      base_md5_digest, scratch_pool));
 
       if (!svn_checksum_match(base_md5_checksum, b->start_md5_checksum))
-        return svn_error_return(svn_checksum_mismatch_err(
+        return svn_error_trace(svn_checksum_mismatch_err(
                                       base_md5_checksum,
                                       b->start_md5_checksum,
                                       scratch_pool,
@@ -980,7 +980,7 @@ close_file(void *file_baton,
                                      expected_md5_digest, scratch_pool));
 
       if (!svn_checksum_match(expected_md5_checksum, b->result_md5_checksum))
-        return svn_error_return(svn_checksum_mismatch_err(
+        return svn_error_trace(svn_checksum_mismatch_err(
                                       expected_md5_checksum,
                                       b->result_md5_checksum,
                                       pool,

Modified: subversion/trunk/subversion/libsvn_client/revert.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/revert.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/revert.c (original)
+++ subversion/trunk/subversion/libsvn_client/revert.c Fri Jun 24 08:09:09 2011
@@ -102,7 +102,7 @@ revert(void *baton, apr_pool_t *result_p
           svn_error_clear(err);
         }
       else
-        return svn_error_return(err);
+        return svn_error_trace(err);
     }
 
   return SVN_NO_ERROR;
@@ -192,5 +192,5 @@ svn_client_revert2(const apr_array_heade
 
   svn_pool_destroy(subpool);
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }

Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Fri Jun 24 08:09:09 2011
@@ -270,7 +270,7 @@ switch_internal(svn_revnum_t *result_rev
       /* Don't rely on the error handling to handle the sleep later, do
          it now */
       svn_io_sleep_for_timestamps(local_abspath, pool);
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
   *use_sleep = TRUE;
 
@@ -300,7 +300,7 @@ switch_internal(svn_revnum_t *result_rev
 
   /* Return errors we might have sustained. */
   if (err)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   /* Let everyone know we're finished here. */
   if (ctx->notify_func2)
@@ -352,7 +352,7 @@ svn_client__switch_internal(svn_revnum_t
                                    ctx->wc_ctx, local_abspath, TRUE,
                                    pool, pool);
   if (err && err->apr_err != SVN_ERR_WC_LOCKED)
-    return svn_error_return(err);
+    return svn_error_trace(err);
 
   acquired_lock = (err == SVN_NO_ERROR);
   svn_error_clear(err);

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Fri Jun 24 08:09:09 2011
@@ -409,7 +409,7 @@ update_internal(svn_revnum_t *result_rev
       /* Don't rely on the error handling to handle the sleep later, do
          it now */
       svn_io_sleep_for_timestamps(local_abspath, pool);
-      return svn_error_return(err);
+      return svn_error_trace(err);
     }
   *use_sleep = TRUE;
 
@@ -548,7 +548,7 @@ svn_client__update_internal(svn_revnum_t
             err,
             svn_wc__release_write_lock(ctx->wc_ctx, lockroot_abspath, pool));
 
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 
@@ -607,7 +607,7 @@ svn_client_update4(apr_array_header_t **
       if (err)
         {
           if(err->apr_err != SVN_ERR_WC_NOT_WORKING_COPY)
-            return svn_error_return(err);
+            return svn_error_trace(err);
 
           svn_error_clear(err);
 

Modified: subversion/trunk/subversion/libsvn_client/url.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/url.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/url.c (original)
+++ subversion/trunk/subversion/libsvn_client/url.c Fri Jun 24 08:09:09 2011
@@ -52,7 +52,7 @@ svn_client_url_from_path2(const char **u
       SVN_ERR(svn_dirent_get_absolute(&path_or_url, path_or_url,
                                       scratch_pool));
 
-      return svn_error_return(
+      return svn_error_trace(
                  svn_wc__node_get_url(url, ctx->wc_ctx, path_or_url,
                                       result_pool, scratch_pool));
     }
@@ -72,7 +72,7 @@ svn_client_root_url_from_path(const char
   if (!svn_path_is_url(path_or_url))
     SVN_ERR(svn_dirent_get_absolute(&path_or_url, path_or_url, pool));
 
-  return svn_error_return(
+  return svn_error_trace(
            svn_client__get_repos_root(url, path_or_url,
                                       ctx, pool, pool));
 }

Modified: subversion/trunk/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Fri Jun 24 08:09:09 2011
@@ -166,7 +166,7 @@ svn_client__path_relative_to_root(const 
                                      _("URL '%s' is not inside repository"),
                                      abspath_or_url);
 
-          return svn_error_return(err);
+          return svn_error_trace(err);
         }
     }
 
@@ -215,7 +215,7 @@ svn_client__default_walker_error_handler
                                          void *walk_baton,
                                          apr_pool_t *pool)
 {
-  return svn_error_return(err);
+  return svn_error_trace(err);
 }
 
 

Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Fri Jun 24 08:09:09 2011
@@ -442,7 +442,7 @@ svn_diff_hunk_readline_original_text(svn
                                      apr_pool_t *result_pool,
                                      apr_pool_t *scratch_pool)
 {
-  return svn_error_return(
+  return svn_error_trace(
     hunk_readline_original_or_modified(hunk->apr_file,
                                        hunk->patch->reverse ?
                                          &hunk->modified_text_range :
@@ -460,7 +460,7 @@ svn_diff_hunk_readline_modified_text(svn
                                      apr_pool_t *result_pool,
                                      apr_pool_t *scratch_pool)
 {
-  return svn_error_return(
+  return svn_error_trace(
     hunk_readline_original_or_modified(hunk->apr_file,
                                        hunk->patch->reverse ?
                                          &hunk->original_text_range :
@@ -1388,6 +1388,6 @@ svn_error_t *
 svn_diff_close_patch_file(svn_patch_file_t *patch_file,
                           apr_pool_t *scratch_pool)
 {
-  return svn_error_return(svn_io_file_close(patch_file->apr_file,
+  return svn_error_trace(svn_io_file_close(patch_file->apr_file,
                                             scratch_pool));
 }



Mime
View raw message