You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/04/28 04:27:39 UTC
svn commit: r938750 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
crop.c entries.c entries.h log.c update_editor.c
Author: hwright
Date: Wed Apr 28 02:27:39 2010
New Revision: 938750
URL: http://svn.apache.org/viewvc?rev=938750&view=rev
Log:
Remove the now-defunct svn_wc__entry_remove(), and replace calls to it with
calls to svn_wc__db_temp_op_remove_entry().
* subversion/libsvn_wc/entries.c
(svn_wc__entry_remove): Remove.
* subversion/libsvn_wc/entries.h
(svn_wc__entry_remove): Remove.
* subversion/libsvn_wc/crop.c
subversion/libsvn_wc/adm_ops.c
subversion/libsvn_wc/update_editor.c
subversion/libsvn_wc/entries.c
subversion/libsvn_wc/log.c:
Update callers.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/crop.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/entries.h
subversion/trunk/subversion/libsvn_wc/log.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=938750&r1=938749&r2=938750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Apr 28 02:27:39 2010
@@ -211,7 +211,8 @@ tweak_entries(svn_wc__db_t *db,
|| status == svn_wc__db_status_obstructed_add)
&& !excluded)
{
- SVN_ERR(svn_wc__entry_remove(db, child_abspath, iterpool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, child_abspath,
+ iterpool));
if (notify_func)
{
@@ -1922,7 +1923,8 @@ revert_entry(svn_depth_t *depth,
adm_access, for which we definitely can't use the 'else'
code path (as it will remove the parent from version
control... (See issue 2425) */
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, pool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ pool));
}
else
{
@@ -2450,7 +2452,8 @@ svn_wc__internal_remove_from_revision_co
scratch_pool));
/* Remove NAME from PATH's entries file: */
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, scratch_pool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ scratch_pool));
/* Remove text-base/NAME.svn-base */
SVN_ERR(svn_io_remove_file2(text_base_file, TRUE, scratch_pool));
@@ -2473,7 +2476,8 @@ svn_wc__internal_remove_from_revision_co
just delete the entry in the parent directory.
### This case disappears after we move to one DB. */
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, scratch_pool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ scratch_pool));
}
else /* looking at THIS_DIR */
{
@@ -2503,7 +2507,8 @@ svn_wc__internal_remove_from_revision_co
iterpool));
if (hidden)
{
- SVN_ERR(svn_wc__entry_remove(db, entry_abspath, iterpool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, entry_abspath,
+ iterpool));
continue;
}
@@ -2543,7 +2548,8 @@ svn_wc__internal_remove_from_revision_co
full_path. We need to remove that entry: */
if (! is_root)
{
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, iterpool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ iterpool));
}
}
Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=938750&r1=938749&r2=938750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Wed Apr 28 02:27:39 2010
@@ -127,7 +127,8 @@ crop_children(svn_wc__db_t *db,
? svn_depth_immediates
: svn_depth_files;
if (depth < remove_below)
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, iterpool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ iterpool));
continue;
}
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=938750&r1=938749&r2=938750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Apr 28 02:27:39 2010
@@ -2780,16 +2780,6 @@ fold_entry(svn_wc_entry_t *cur_entry,
}
-svn_error_t *
-svn_wc__entry_remove(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- return svn_error_return(svn_wc__db_temp_op_remove_entry(db, local_abspath,
- scratch_pool));
-}
-
-
/* Our general purpose intelligence module for handling a scheduling change
to a single entry.
@@ -3019,7 +3009,8 @@ entry_modify(svn_wc__db_t *db,
&& cur_entry->schedule == svn_wc_schedule_add
&& !cur_entry->deleted)
{
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, subpool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ subpool));
svn_pool_destroy(subpool);
return SVN_NO_ERROR;
}
@@ -3223,7 +3214,8 @@ svn_wc__tweak_entry(svn_wc__db_t *db,
if (allow_removal
&& (entry->deleted || (entry->absent && entry->revision != new_rev)))
{
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, scratch_pool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ scratch_pool));
}
else if (modify_flags)
{
Modified: subversion/trunk/subversion/libsvn_wc/entries.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.h?rev=938750&r1=938749&r2=938750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.h (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.h Wed Apr 28 02:27:39 2010
@@ -147,14 +147,6 @@ svn_wc__entry_modify_stub(svn_wc__db_t *
int modify_flags,
apr_pool_t *scratch_pool);
-/* Remove LOCAL_ABSPATH from DB, unconditionally.
-
- All temporary allocations will be performed in SCRATCH_POOL. */
-svn_error_t *
-svn_wc__entry_remove(svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
/* Tweak the information for LOCAL_ABSPATH in DB. If NEW_URL is non-null,
* make this the entry's new url. If NEW_REV is valid, make this the
Modified: subversion/trunk/subversion/libsvn_wc/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/log.c?rev=938750&r1=938749&r2=938750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/log.c (original)
+++ subversion/trunk/subversion/libsvn_wc/log.c Wed Apr 28 02:27:39 2010
@@ -403,7 +403,8 @@ basic_delete_entry(svn_wc__db_t *db,
*/
if (status != svn_wc__db_status_obstructed_add)
{
- SVN_ERR(svn_wc__entry_remove(db, local_abspath, scratch_pool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath,
+ scratch_pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=938750&r1=938749&r2=938750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Apr 28 02:27:39 2010
@@ -901,7 +901,8 @@ complete_directory(struct edit_baton *eb
&& svn_wc__adm_missing(eb->db, node_abspath, iterpool)
&& status != svn_wc__db_status_absent)
{
- SVN_ERR(svn_wc__entry_remove(eb->db, node_abspath, iterpool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(eb->db, node_abspath,
+ iterpool));
do_notification(eb, node_abspath, svn_wc_notify_update_delete,
(kind == svn_wc__db_kind_dir)
@@ -2119,7 +2120,7 @@ do_entry_deletion(struct edit_baton *eb,
SVN_ERR(svn_wc__db_node_hidden(&hidden, eb->db, local_abspath, pool));
if (hidden)
{
- SVN_ERR(svn_wc__entry_remove(eb->db, local_abspath, pool));
+ SVN_ERR(svn_wc__db_temp_op_remove_entry(eb->db, local_abspath, pool));
if (strcmp(local_abspath, eb->target_abspath) == 0)
eb->target_deleted = TRUE;