Author: julianfoad
Date: Wed Nov 11 15:22:31 2015
New Revision: 1713870
URL: http://svn.apache.org/viewvc?rev=1713870&view=rev
Log:
On the 'move-tracking-2' branch: Remove/hide/replace all SVN_DBG calls.
* subversion/libsvn_delta/branch.c
Remove SVN_DBG calls.
* subversion/libsvn_delta/branch_compat.c
Comment out SVN_DBG calls.
* subversion/libsvn_delta/element.c
Remove SVN_DBG calls.
* subversion/libsvn_ra_local/ra_plugin.c
Remove SVN_DBG calls.
* subversion/libsvn_ra/ra_loader.c
Comment out SVN_DBG calls.
* subversion/libsvn_wc/update_editor.c
Comment out SVN_DBG calls.
* subversion/svnmover/merge3.c
Comment out SVN_DBG calls.
* subversion/svnmover/svnmover.c
Remove SVN_DBG calls.
(migrate_replay_rev_started,
migrate_replay_rev_finished): Convert SVN_DBG calls to notifications.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-2/subversion/svnmover/merge3.c
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed
Nov 11 15:22:31 2015
@@ -186,8 +186,6 @@ branch_txn_delete_branch(svn_branch_txn_
if (strcmp(b->bid, bid) == 0)
{
- SVN_DBG(("deleting branch b%s e%d",
- bid, b->priv->element_tree->root_eid));
svn_sort__array_delete(txn->priv->branches, i, 1);
break;
}
@@ -793,9 +791,6 @@ copy_subtree(const svn_branch_el_rev_id_
{
svn_element_tree_t *new_subtree;
- SVN_DBG(("cp subtree from e%d to e%d/%s",
- from_el_rev->eid, to_parent_eid, to_name));
-
SVN_ERR_ASSERT(from_el_rev->branch->priv->is_flat);
SVN_ERR(svn_branch_state_get_elements(from_el_rev->branch, &new_subtree,
@@ -825,9 +820,6 @@ branch_state_copy_tree(svn_branch_state_
svn_branch_state_t *src_branch;
svn_branch_el_rev_id_t *from_el_rev;
- SVN_DBG(("copy_tree(e%d -> e%d/%s)",
- src_el_rev->eid, new_parent_eid, new_name));
-
SVN_ERR(branch_in_rev_or_txn(&src_branch, src_el_rev, txn, scratch_pool));
from_el_rev = svn_branch_el_rev_id_create(src_branch, src_el_rev->eid,
src_el_rev->rev, scratch_pool);
@@ -1023,9 +1015,6 @@ branch_state_delete_one(svn_branch_state
{
SVN_ERR_ASSERT(EID_IS_ALLOCATED(branch, eid));
- SVN_DBG(("delete(b%s e%d)",
- svn_branch_get_id(branch, scratch_pool), eid));
-
branch_map_set(branch, eid, NULL);
return SVN_NO_ERROR;
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c
Wed Nov 11 15:22:31 2015
@@ -1178,8 +1178,8 @@ convert_branch_to_paths(apr_hash_t *path
}
else
{
- SVN_DBG(("branch-to-path: b%s e%d -> <already present; not
overwriting> (%s)",
- svn_branch_get_id(branch, scratch_pool), eid, rrpath));
+ /*SVN_DBG(("branch-to-path: b%s e%d -> <already present; not
overwriting> (%s)",
+ svn_branch_get_id(branch, scratch_pool), eid, rrpath));*/
}
}
return SVN_NO_ERROR;
@@ -1347,10 +1347,10 @@ drive_changes_r(const char *rrpath,
svn_pathrev_t final_copy_from;
svn_boolean_t succession;
- SVN_DBG(("rrpath '%s' current=%s, final=e%d)",
+ /*SVN_DBG(("rrpath '%s' current=%s, final=e%d)",
rrpath,
pred_loc ? peg_path_str(*pred_loc, scratch_pool) : "<nil>",
- final_el_rev ? final_el_rev->eid : -1));
+ final_el_rev ? final_el_rev->eid : -1));*/
SVN_ERR_ASSERT(!pred_loc
|| (pred_loc->relpath && SVN_IS_VALID_REVNUM(pred_loc->rev)));
@@ -1412,14 +1412,16 @@ drive_changes_r(const char *rrpath,
we've already issued a delete. */
if (check_existence(eb->changes, rrpath) != svn_tristate_false)
{
- SVN_DBG(("ev1:del(%s)", rrpath));
+ /*SVN_DBG(("ev1:del(%s)", rrpath));*/
/* ### We don't need "delete_subtree", we only need to insert a
single delete operation, as we know we haven't
inserted any changes inside this subtree. */
SVN_ERR(delete_subtree(eb->changes, rrpath, pred_loc->rev));
}
else
- SVN_DBG(("ev1:del(%s): parent is already deleted", rrpath));
+ {
+ /*SVN_DBG(("ev1:del(%s): parent is already deleted", rrpath))*/
+ }
}
/* If there's a final node, it's being added or modified.
@@ -1448,11 +1450,11 @@ drive_changes_r(const char *rrpath,
if (svn_element_payload_equal(current_payload,
final_payload, scratch_pool))
{
- SVN_DBG(("ev1:no-op(%s)", rrpath));
+ /*SVN_DBG(("ev1:no-op(%s)", rrpath));*/
}
else
{
- SVN_DBG(("ev1:mod(%s)", rrpath));
+ /*SVN_DBG(("ev1:mod(%s)", rrpath));*/
SVN_ERR(insert_change(&change, eb->changes, rrpath,
RESTRUCTURE_NONE));
change->changing_rev = pred_loc->rev;
@@ -1460,7 +1462,7 @@ drive_changes_r(const char *rrpath,
}
else /* add or copy/move */
{
- SVN_DBG(("ev1:add(%s)", rrpath));
+ /*SVN_DBG(("ev1:add(%s)", rrpath));*/
SVN_ERR(insert_change(&change, eb->changes, rrpath,
RESTRUCTURE_ADD));
@@ -1539,7 +1541,7 @@ drive_changes_r(const char *rrpath,
child_pred->relpath = this_rrpath;
}
}
- SVN_DBG(("child '%s' current=%s final? %d%s",
+ /*(("child '%s' current=%s final? %d%s",
name,
child_pred ? peg_path_str(*child_pred, scratch_pool)
: "<nil>",
@@ -1547,7 +1549,7 @@ drive_changes_r(const char *rrpath,
final_copy_from.relpath
? apr_psprintf(scratch_pool, " parent-cp-from=%s@%ld",
final_copy_from.relpath,
- final_copy_from.rev) : ""));
+ final_copy_from.rev) : ""));*/
SVN_ERR(drive_changes_r(this_rrpath,
child_pred,
@@ -1999,8 +2001,8 @@ svn_branch_compat_txn_from_delta_for_upd
= apr_pcalloc(result_pool, sizeof(*update_editor));
svn_branch_compat__shim_connector_t *shim_connector;
- SVN_DBG(("svn_delta__ev3_from_delta_for_update(base='%s')...",
- base_repos_relpath));
+ /*(("svn_delta__ev3_from_delta_for_update(base='%s')...",
+ base_repos_relpath));*/
/*SVN_ERR(svn_delta__get_debug_editor(&deditor, &dedit_baton,
deditor, dedit_baton,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c Wed
Nov 11 15:22:31 2015
@@ -439,7 +439,6 @@ svn_element_tree_purge_orphans(apr_hash_
/* Purge if parent is deleted */
if (! parent_element)
{
- SVN_DBG(("purge orphan: e%d", this_eid));
svn_eid_hash_set(e_map, this_eid, NULL);
changed = TRUE;
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Wed
Nov 11 15:22:31 2015
@@ -699,8 +699,8 @@ svn_branch_revision_fetch_info(svn_branc
if (! value && revision == 0)
{
value = svn_branch_get_default_r0_metadata(scratch_pool);
- SVN_DBG(("fetch_per_revision_info(r%ld): LOADED DEFAULT INFO:\n%s",
- revision, value->data));
+ /*SVN_DBG(("fetch_per_revision_info(r%ld): LOADED DEFAULT INFO:\n%s",
+ revision, value->data));*/
SVN_ERR(write_rev_prop(ra_session, branch_info_dir, revision, value,
scratch_pool));
}
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
Wed Nov 11 15:22:31 2015
@@ -1052,9 +1052,6 @@ fetch_func(svn_node_kind_t *kind_p,
}
}
- if (props_p)
- SVN_DBG(("ra-local-fetch-func(%s@%ld): fetched %d props",
- session_relpath, revision, apr_hash_count(*props_p)));
return SVN_NO_ERROR;
}
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
Wed Nov 11 15:22:31 2015
@@ -5114,8 +5114,8 @@ make_editor3(svn_revnum_t *target_revisi
sfb->base_abspath = eb->anchor_abspath;
sfb->base_rrpath = anchor_repos_relpath;
sfb->fetch_base = TRUE;
- SVN_DBG(("wc make up/sw editor: base_rrpath='%s'; base_abspath=%s",
- sfb->base_rrpath, sfb->base_abspath));
+ /*SVN_DBG(("wc make up/sw editor: base_rrpath='%s'; base_abspath=%s",
+ sfb->base_rrpath, sfb->base_abspath));*/
SVN_ERR(svn_branch_compat_txn_from_delta_for_update(
editor,
Modified: subversion/branches/move-tracking-2/subversion/svnmover/merge3.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/merge3.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/merge3.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/merge3.c Wed Nov 11
15:22:31 2015
@@ -540,16 +540,16 @@ payload_merge(svn_element_payload_t **re
else if (policy->merge_double_modify
&& svn_element_payload_equal(side1, side2, scratch_pool))
{
- SVN_DBG(("e%d double modify: ... -> { ... | ... }",
- eid));
+ /*SVN_DBG(("e%d double modify: ... -> { ... | ... }",
+ eid));*/
result = side1;
}
else
{
/* ### Need not conflict if can merge props and text separately. */
- SVN_DBG(("e%d conflict: payload: ... -> { ... | ... }",
- eid));
+ /*SVN_DBG(("e%d conflict: payload: ... -> { ... | ... }",
+ eid));*/
conflict = TRUE;
}
}
@@ -609,14 +609,14 @@ element_merge(svn_element_content_t **re
else if (policy->merge_double_reparent
&& side1->parent_eid == side2->parent_eid)
{
- SVN_DBG(("e%d double reparent: e%d -> { e%d | e%d }",
- eid, yca->parent_eid, side1->parent_eid,
side2->parent_eid));
+ /*SVN_DBG(("e%d double reparent: e%d -> { e%d | e%d }",
+ eid, yca->parent_eid, side1->parent_eid,
side2->parent_eid));*/
result->parent_eid = side1->parent_eid;
}
else
{
- SVN_DBG(("e%d conflict: parent: e%d -> { e%d | e%d }",
- eid, yca->parent_eid, side1->parent_eid,
side2->parent_eid));
+ /*SVN_DBG(("e%d conflict: parent: e%d -> { e%d | e%d }",
+ eid, yca->parent_eid, side1->parent_eid,
side2->parent_eid));*/
conflict = TRUE;
}
@@ -632,14 +632,14 @@ element_merge(svn_element_content_t **re
else if (policy->merge_double_rename
&& strcmp(side1->name, side2->name) == 0)
{
- SVN_DBG(("e%d double rename: %s -> { %s | %s }",
- eid, yca->name, side1->name, side2->name));
+ /*SVN_DBG(("e%d double rename: %s -> { %s | %s }",
+ eid, yca->name, side1->name, side2->name));*/
result->name = side1->name;
}
else
{
- SVN_DBG(("e%d conflict: name: %s -> { %s | %s }",
- eid, yca->name, side1->name, side2->name));
+ /*SVN_DBG(("e%d conflict: name: %s -> { %s | %s }",
+ eid, yca->name, side1->name, side2->name));*/
conflict = TRUE;
}
@@ -659,14 +659,14 @@ element_merge(svn_element_content_t **re
/* Double delete (as we assume at least one of YCA/SIDE1/SIDE2 exists) */
if (policy->merge_double_delete)
{
- SVN_DBG(("e%d double delete",
- eid));
+ /*SVN_DBG(("e%d double delete",
+ eid));*/
result = side1;
}
else
{
- SVN_DBG(("e%d conflict: delete vs. delete",
- eid));
+ /*SVN_DBG(("e%d conflict: delete vs. delete",
+ eid));*/
conflict = TRUE;
}
}
@@ -679,24 +679,24 @@ element_merge(svn_element_content_t **re
&& !side2->payload->is_subbranch_root
&& svn_element_content_equal(side1, side2, scratch_pool))
{
- SVN_DBG(("e%d double add",
- eid));
+ /*SVN_DBG(("e%d double add",
+ eid));*/
result = side1;
}
else
{
- SVN_DBG(("e%d conflict: add vs. add (%s)",
+ /*SVN_DBG(("e%d conflict: add vs. add (%s)",
eid,
svn_element_content_equal(side1, side2, scratch_pool)
- ? "same content" : "different content"));
+ ? "same content" : "different content"));*/
conflict = TRUE;
}
}
else
{
/* The remaining cases must be delete vs. modify */
- SVN_DBG(("e%d conflict: delete vs. modify: %d -> { %d | %d }",
- eid, !!yca, !!side1, !!side2));
+ /*SVN_DBG(("e%d conflict: delete vs. modify: %d -> { %d | %d }",
+ eid, !!yca, !!side1, !!side2));*/
conflict = TRUE;
}
@@ -965,15 +965,15 @@ branch_merge_subtree_r(svn_branch_txn_t
const merge_conflict_policy_t policy = { TRUE, TRUE, TRUE, TRUE, TRUE };
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
- SVN_DBG(("merge src: r%2ld %s e%3d",
+ /*SVN_DBG(("merge src: r%2ld %s e%3d",
src->rev,
- svn_branch_get_id(src->branch, scratch_pool), src->eid));
- SVN_DBG(("merge tgt: r%2ld %s e%3d",
+ svn_branch_get_id(src->branch, scratch_pool), src->eid));*/
+ /*SVN_DBG(("merge tgt: r%2ld %s e%3d",
tgt->rev,
- svn_branch_get_id(tgt->branch, scratch_pool), tgt->eid));
- SVN_DBG(("merge yca: r%2ld %s e%3d",
+ svn_branch_get_id(tgt->branch, scratch_pool), tgt->eid));*/
+ /*SVN_DBG(("merge yca: r%2ld %s e%3d",
yca->rev,
- svn_branch_get_id(yca->branch, scratch_pool), yca->eid));
+ svn_branch_get_id(yca->branch, scratch_pool), yca->eid));*/
svnmover_notify_v("merging into branch %s",
svn_branch_get_id(tgt->branch, scratch_pool));
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1713870&r1=1713869&r2=1713870&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Nov
11 15:22:31 2015
@@ -462,20 +462,17 @@ subtree_replay(svn_branch_state_t *edit_
{
if (e0 && e1)
{
- SVN_DBG(("replay: alter e%d", eid));
SVN_ERR(svn_branch_state_alter_one(edit_branch, eid,
e1->parent_eid, e1->name,
e1->payload, scratch_pool));
}
else if (e0)
{
- SVN_DBG(("replay: delete e%d", eid));
SVN_ERR(svn_branch_state_delete_one(edit_branch, eid,
scratch_pool));
}
else
{
- SVN_DBG(("replay: instan. e%d", eid));
SVN_ERR(svn_branch_state_alter_one(edit_branch, eid,
e1->parent_eid, e1->name,
e1->payload, scratch_pool));
@@ -1608,10 +1605,6 @@ subtree_diff_r(svn_branch_subtree_t *lef
apr_hash_t *subbranches_l, *subbranches_r, *subbranches_all;
apr_hash_index_t *hi;
- SVN_DBG(("subtree_diff_r: l='%s' r='%s'",
- left ? left_rrpath : "<nil>",
- right ? right_rrpath : "<nil>"));
-
if (!left)
{
header = apr_psprintf(scratch_pool,
@@ -2498,7 +2491,7 @@ migrate_replay_rev_started(svn_revnum_t
const svn_delta_editor_t *old_editor;
void *old_edit_baton;
- SVN_DBG(("migrate: start r%ld", revision));
+ svnmover_notify("migrate: start r%ld", revision);
SVN_ERR(svn_branch_get_migration_editor(&old_editor, &old_edit_baton,
rb->edit_txn,
@@ -2531,7 +2524,7 @@ migrate_replay_rev_finished(svn_revnum_t
SVN_ERR(editor->close_edit(edit_baton, pool));
- SVN_DBG(("migrate: moves in revision r%ld:", revision));
+ svnmover_notify("migrate: moves in revision r%ld:", revision);
if (moves_in_revision)
{
