You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/01/23 18:34:21 UTC
svn commit: r1654281 - in /subversion/trunk/subversion/svnrdump:
dump_editor.c load_editor.c
Author: julianfoad
Date: Fri Jan 23 17:34:21 2015
New Revision: 1654281
URL: http://svn.apache.org/r1654281
Log:
* subversion/svnrdump/dump_editor.c,
subversion/svnrdump/load_editor.c
Remove debug statements.
Modified:
subversion/trunk/subversion/svnrdump/dump_editor.c
subversion/trunk/subversion/svnrdump/load_editor.c
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1654281&r1=1654280&r2=1654281&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Fri Jan 23 17:34:21 2015
@@ -40,11 +40,6 @@
#define ARE_VALID_COPY_ARGS(p,r) ((p) && SVN_IS_VALID_REVNUM(r))
-#if 0
-#define LDR_DBG(x) SVN_DBG(x)
-#else
-#define LDR_DBG(x) while(0)
-#endif
/* A directory baton used by all directory-related callback functions
* in the dump editor. */
@@ -573,8 +568,6 @@ open_root(void *edit_baton,
/* Clear the per-revision pool after each revision */
svn_pool_clear(eb->pool);
- LDR_DBG(("open_root %p\n", *root_baton));
-
if (eb->update_anchor_relpath)
{
int i;
@@ -639,8 +632,6 @@ delete_entry(const char *path,
{
struct dir_baton *pb = parent_baton;
- LDR_DBG(("delete_entry %s\n", path));
-
SVN_ERR(dump_pending(pb->eb, pool));
/* We don't dump this deletion immediate. Rather, we add this path
@@ -665,8 +656,6 @@ add_directory(const char *path,
struct dir_baton *new_db;
svn_boolean_t is_copy;
- LDR_DBG(("add_directory %s\n", path));
-
SVN_ERR(dump_pending(pb->eb, pool));
new_db = make_dir_baton(path, copyfrom_path, copyfrom_rev, pb->eb,
@@ -711,8 +700,6 @@ open_directory(const char *path,
const char *copyfrom_path = NULL;
svn_revnum_t copyfrom_rev = SVN_INVALID_REVNUM;
- LDR_DBG(("open_directory %s\n", path));
-
SVN_ERR(dump_pending(pb->eb, pool));
/* If the parent directory has explicit comparison path and rev,
@@ -740,8 +727,6 @@ close_directory(void *dir_baton,
apr_hash_index_t *hi;
svn_boolean_t this_pending;
- LDR_DBG(("close_directory %p\n", dir_baton));
-
/* Remember if this directory is the one currently pending. */
this_pending = (db->eb->pending_baton == db);
@@ -794,8 +779,6 @@ add_file(const char *path,
struct file_baton *fb;
void *was_deleted;
- LDR_DBG(("add_file %s\n", path));
-
SVN_ERR(dump_pending(pb->eb, pool));
/* Make the file baton. */
@@ -831,8 +814,6 @@ open_file(const char *path,
struct dir_baton *pb = parent_baton;
struct file_baton *fb;
- LDR_DBG(("open_file %s\n", path));
-
SVN_ERR(dump_pending(pb->eb, pool));
/* Make the file baton. */
@@ -861,8 +842,6 @@ change_dir_prop(void *parent_baton,
struct dir_baton *db = parent_baton;
svn_boolean_t this_pending;
- LDR_DBG(("change_dir_prop %p\n", parent_baton));
-
/* This directory is not pending, but something else is, so handle
the "something else". */
this_pending = (db->eb->pending_baton == db);
@@ -895,8 +874,6 @@ change_file_prop(void *file_baton,
{
struct file_baton *fb = file_baton;
- LDR_DBG(("change_file_prop %p\n", file_baton));
-
if (svn_property_kind2(name) != svn_prop_regular_kind)
return SVN_NO_ERROR;
@@ -925,8 +902,6 @@ apply_textdelta(void *file_baton, const
struct dump_edit_baton *eb = fb->eb;
svn_stream_t *delta_filestream;
- LDR_DBG(("apply_textdelta %p\n", file_baton));
-
/* Use a temporary file to measure the Text-content-length */
delta_filestream = svn_stream_from_aprfile2(eb->delta_file, TRUE, pool);
@@ -953,8 +928,6 @@ close_file(void *file_baton,
svn_stringbuf_t *propstring;
apr_array_header_t *headers = svn_repos__dumpfile_headers_create(pool);
- LDR_DBG(("close_file %p\n", file_baton));
-
SVN_ERR(dump_pending(eb, pool));
/* Dump the node. */
Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1654281&r1=1654280&r2=1654281&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri Jan 23 17:34:21 2015
@@ -43,14 +43,7 @@
#define ARE_VALID_COPY_ARGS(p,r) ((p) && SVN_IS_VALID_REVNUM(r))
-#if 0
-#define LDR_DBG(x) SVN_DBG(x)
-#else
-#define LDR_DBG(x) while(0)
-#endif
-
-
/**
* General baton used by the parser functions.
*/
@@ -547,8 +540,6 @@ new_node_record(void **node_baton,
rb->rev - rb->rev_offset - 1,
rb->pool, &child_baton));
- LDR_DBG(("Opened root %p\n", child_baton));
-
/* child_baton corresponds to the root directory baton here */
push_directory(rb, child_baton, "", TRUE /*is_added*/,
NULL, SVN_INVALID_REVNUM);
@@ -614,7 +605,6 @@ new_node_record(void **node_baton,
/* Don't worry about destroying the actual rb->db object,
since the pool we're using has the lifetime of one
revision anyway */
- LDR_DBG(("Closing dir %p\n", rb->db->baton));
SVN_ERR(commit_editor->close_directory(rb->db->baton, rb->pool));
rb->db = rb->db->parent;
}
@@ -629,7 +619,6 @@ new_node_record(void **node_baton,
rb->db->baton,
rb->rev - rb->rev_offset - 1,
rb->pool, &child_baton));
- LDR_DBG(("Opened dir %p\n", child_baton));
push_directory(rb, child_baton, relpath_compose, TRUE /*is_added*/,
NULL, SVN_INVALID_REVNUM);
}
@@ -670,7 +659,6 @@ new_node_record(void **node_baton,
{
case svn_node_action_delete:
case svn_node_action_replace:
- LDR_DBG(("Deleting entry %s in %p\n", nb->path, rb->db->baton));
SVN_ERR(commit_editor->delete_entry(nb->path, rb->rev - rb->rev_offset,
rb->db->baton, rb->pool));
if (nb->action == svn_node_action_delete)
@@ -686,16 +674,12 @@ new_node_record(void **node_baton,
nb->copyfrom_url,
nb->copyfrom_rev,
rb->pool, &(nb->file_baton)));
- LDR_DBG(("Added file %s to dir %p as %p\n",
- nb->path, rb->db->baton, nb->file_baton));
break;
case svn_node_dir:
SVN_ERR(commit_editor->add_directory(nb->path, rb->db->baton,
nb->copyfrom_url,
nb->copyfrom_rev,
rb->pool, &child_baton));
- LDR_DBG(("Added dir %s to dir %p as %p\n",
- nb->path, rb->db->baton, child_baton));
push_directory(rb, child_baton, nb->path, TRUE /*is_added*/,
nb->copyfrom_path, nb->copyfrom_rev);
break;
@@ -848,7 +832,6 @@ remove_node_props(void *baton)
/* Find the path and revision that has the node's original properties */
if (ARE_VALID_COPY_ARGS(nb->copyfrom_path, nb->copyfrom_rev))
{
- LDR_DBG(("using nb->copyfrom %s@%ld", nb->copyfrom_path, nb->copyfrom_rev));
orig_path = nb->copyfrom_path;
orig_rev = nb->copyfrom_rev;
}
@@ -857,8 +840,6 @@ remove_node_props(void *baton)
{
/* If this is a dir, then it's described by rb->db;
if this is a file, then it's a child of the dir in rb->db. */
- LDR_DBG(("using rb->db->copyfrom (k=%d) %s@%ld",
- nb->kind, rb->db->copyfrom_path, rb->db->copyfrom_rev));
orig_path = (nb->kind == svn_node_dir)
? rb->db->copyfrom_path
: svn_relpath_join(rb->db->copyfrom_path,
@@ -868,13 +849,11 @@ remove_node_props(void *baton)
}
else
{
- LDR_DBG(("using self.path@head %s@%ld", nb->path, SVN_INVALID_REVNUM));
/* ### Should we query at a known, fixed, "head" revision number
instead of passing SVN_INVALID_REVNUM and getting a moving target? */
orig_path = nb->path;
orig_rev = SVN_INVALID_REVNUM;
}
- LDR_DBG(("Trying %s@%ld", orig_path, orig_rev));
if ((nb->action == svn_node_action_add
|| nb->action == svn_node_action_replace)
@@ -915,7 +894,6 @@ set_fulltext(svn_stream_t **stream,
void *handler_baton;
apr_pool_t *pool = nb->rb->pool;
- LDR_DBG(("Setting fulltext for %p\n", nb->file_baton));
SVN_ERR(commit_editor->apply_textdelta(nb->file_baton, nb->base_checksum,
pool, &handler, &handler_baton));
*stream = svn_txdelta_target_push(handler, handler_baton,
@@ -932,7 +910,6 @@ apply_textdelta(svn_txdelta_window_handl
const struct svn_delta_editor_t *commit_editor = nb->rb->pb->commit_editor;
apr_pool_t *pool = nb->rb->pool;
- LDR_DBG(("Applying textdelta to %p\n", nb->file_baton));
SVN_ERR(commit_editor->apply_textdelta(nb->file_baton, nb->base_checksum,
pool, handler, handler_baton));
@@ -972,7 +949,6 @@ close_node(void *baton)
deleted the file (which doesn't require us to open it). */
if ((nb->kind == svn_node_file) && (nb->file_baton))
{
- LDR_DBG(("Closing file %p\n", nb->file_baton));
SVN_ERR(commit_editor->close_file(nb->file_baton, NULL, nb->rb->pool));
}
@@ -1002,12 +978,10 @@ close_revision(void *baton)
session itself */
while (rb->db && rb->db->parent)
{
- LDR_DBG(("Closing dir %p\n", rb->db->baton));
SVN_ERR(commit_editor->close_directory(rb->db->baton, rb->pool));
rb->db = rb->db->parent;
}
/* root dir's baton */
- LDR_DBG(("Closing edit on %p\n", commit_edit_baton));
SVN_ERR(commit_editor->close_directory(rb->db->baton, rb->pool));
SVN_ERR(commit_editor->close_edit(commit_edit_baton, rb->pool));
}
@@ -1025,8 +999,6 @@ close_revision(void *baton)
rb->rev - rb->rev_offset - 1,
rb->pool, &child_baton));
- LDR_DBG(("Opened root %p\n", child_baton));
- LDR_DBG(("Closing edit on %p\n", commit_edit_baton));
SVN_ERR(commit_editor->close_directory(child_baton, rb->pool));
SVN_ERR(commit_editor->close_edit(commit_edit_baton, rb->pool));
}