svn commit: r1714769 - in /subversion/trunk: subversion/include/private/svn_delta_private.h subversion/libsvn_delta/debug_editor.c subversion/libsvn_delta/debug_editor.h tools/dev/svnmover/svnmover.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Nov 17 12:27:36 2015
New Revision: 1714769

URL: http://svn.apache.org/viewvc?rev=1714769&view=rev
Log:
Move a debugging declaration to a more suitable place.

* subversion/include/private/svn_delta_private.h
  (svn_delta__get_debug_editor): Move to here from debug_editor.h.

* subversion/libsvn_delta/debug_editor.h
  Delete this file.

* subversion/libsvn_delta/debug_editor.c,
  tools/dev/svnmover/svnmover.c
  Update the #include.

Removed:
    subversion/trunk/subversion/libsvn_delta/debug_editor.h
Modified:
    subversion/trunk/subversion/include/private/svn_delta_private.h
    subversion/trunk/subversion/libsvn_delta/debug_editor.c
    subversion/trunk/tools/dev/svnmover/svnmover.c

Modified: subversion/trunk/subversion/include/private/svn_delta_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_delta_private.h?rev=1714769&r1=1714768&r2=1714769&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_delta_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_delta_private.h Tue Nov 17 12:27:36 2015
@@ -108,6 +108,25 @@ svn_txdelta__read_raw_window_len(apr_siz
                                  svn_stream_t *stream,
                                  apr_pool_t *pool);
 
+/* Return a debug editor that wraps @a wrapped_editor.
+ *
+ * The debug editor simply prints an indication of what callbacks are being
+ * called to @c stdout, and is only intended for use in debugging subversion
+ * editors.
+ *
+ * @a prefix, if non-null, is printed between "DBG: " and each indication.
+ *
+ * Note: Our test suite generally ignores stdout lines starting with "DBG:".
+ */
+svn_error_t *
+svn_delta__get_debug_editor(const svn_delta_editor_t **editor,
+                            void **edit_baton,
+                            const svn_delta_editor_t *wrapped_editor,
+                            void *wrapped_baton,
+                            const char *prefix,
+                            apr_pool_t *pool);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/trunk/subversion/libsvn_delta/debug_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/debug_editor.c?rev=1714769&r1=1714768&r2=1714769&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/debug_editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/debug_editor.c Tue Nov 17 12:27:36 2015
@@ -23,7 +23,7 @@
 
 #include "svn_io.h"
 
-#include "debug_editor.h"
+#include "private/svn_delta_private.h"
 
 struct edit_baton
 {

Modified: subversion/trunk/tools/dev/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/svnmover.c?rev=1714769&r1=1714768&r2=1714769&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/svnmover.c (original)
+++ subversion/trunk/tools/dev/svnmover/svnmover.c Tue Nov 17 12:27:36 2015
@@ -53,7 +53,7 @@
 #include "private/svn_sorts_private.h"
 #include "private/svn_token.h"
 #include "private/svn_client_private.h"
-#include "../libsvn_delta/debug_editor.h"
+#include "private/svn_delta_private.h"
 
 #ifdef HAVE_LINENOISE
 #include "linenoise/linenoise.h"