Author: rhuijben
Date: Mon Feb 23 00:05:58 2015
New Revision: 1661587
URL: http://svn.apache.org/r1661587
Log:
Remove 3 unused arguments from svn_wc__db_op_remove_node().
* subversion/libsvn_wc/delete.c
(svn_wc__internal_remove_from_revision_control): Update caller.
* subversion/libsvn_wc/wc_db.c
(remove_node_txn): Remove 3 arguments and code processing them.
(svn_wc__db_op_remove_node): Update caller.
* subversion/libsvn_wc/wc_db.h
Modified:
subversion/trunk/subversion/libsvn_wc/delete.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/delete.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/delete.c?rev=1661587&r1=1661586&r2=1661587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/delete.c (original)
+++ subversion/trunk/subversion/libsvn_wc/delete.c Mon Feb 23 00:05:58 2015
@@ -431,9 +431,6 @@ svn_wc__internal_remove_from_revision_co
db, local_abspath,
destroy_wf /* destroy_wc */,
destroy_wf /* destroy_changes */,
- SVN_INVALID_REVNUM,
- svn_wc__db_status_not_present,
- svn_node_none,
NULL, NULL,
cancel_func, cancel_baton,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1661587&r1=1661586&r2=1661587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Feb 23 00:05:58 2015
@@ -7369,9 +7369,6 @@ remove_node_txn(svn_boolean_t *left_chan
svn_wc__db_t *db,
svn_boolean_t destroy_wc,
svn_boolean_t destroy_changes,
- svn_revnum_t not_present_rev,
- svn_wc__db_status_t not_present_status,
- svn_node_kind_t not_present_kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
svn_cancel_func_t cancel_func,
@@ -7380,9 +7377,6 @@ remove_node_txn(svn_boolean_t *left_chan
{
svn_sqlite__stmt_t *stmt;
- apr_int64_t repos_id;
- const char *repos_relpath;
-
/* Note that unlike many similar functions it is a valid scenario for this
function to be called on a wcroot! */
@@ -7392,15 +7386,6 @@ remove_node_txn(svn_boolean_t *left_chan
if (left_changes)
*left_changes = FALSE;
- /* Need info for not_present node? */
- if (SVN_IS_VALID_REVNUM(not_present_rev))
- SVN_ERR(svn_wc__db_base_get_info_internal(NULL, NULL, NULL,
- &repos_relpath, &repos_id,
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
- wcroot, local_relpath,
- scratch_pool, scratch_pool));
-
if (destroy_wc
&& (!destroy_changes || *local_relpath == '\0'))
{
@@ -7597,26 +7582,6 @@ remove_node_txn(svn_boolean_t *left_chan
local_relpath));
SVN_ERR(svn_sqlite__step_done(stmt));
- /* Should we leave a not-present node? */
- if (SVN_IS_VALID_REVNUM(not_present_rev))
- {
- insert_base_baton_t ibb;
- blank_ibb(&ibb);
-
- ibb.repos_id = repos_id;
-
- SVN_ERR_ASSERT(not_present_status == svn_wc__db_status_not_present
- || not_present_status == svn_wc__db_status_excluded);
-
- ibb.status = not_present_status;
- ibb.kind = not_present_kind;
-
- ibb.repos_relpath = repos_relpath;
- ibb.revision = not_present_rev;
-
- SVN_ERR(insert_base_node(&ibb, wcroot, local_relpath, scratch_pool));
- }
-
SVN_ERR(add_work_items(wcroot->sdb, work_items, scratch_pool));
if (conflict)
SVN_ERR(svn_wc__db_mark_conflict_internal(wcroot, local_relpath,
@@ -7631,9 +7596,6 @@ svn_wc__db_op_remove_node(svn_boolean_t
const char *local_abspath,
svn_boolean_t destroy_wc,
svn_boolean_t destroy_changes,
- svn_revnum_t not_present_revision,
- svn_wc__db_status_t not_present_status,
- svn_node_kind_t not_present_kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
svn_cancel_func_t cancel_func,
@@ -7652,8 +7614,7 @@ svn_wc__db_op_remove_node(svn_boolean_t
SVN_WC__DB_WITH_TXN(remove_node_txn(left_changes,
wcroot, local_relpath, db,
destroy_wc, destroy_changes,
- not_present_revision, not_present_status,
- not_present_kind, conflict, work_items,
+ conflict, work_items,
cancel_func, cancel_baton, scratch_pool),
wcroot);
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1661587&r1=1661586&r2=1661587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Mon Feb 23 00:05:58 2015
@@ -3099,10 +3099,6 @@ svn_wc__db_wclock_owns_lock(svn_boolean_
This operation always recursively removes all nodes at and below
LOCAL_ABSPATH from NODES and ACTUAL.
- If NOT_PRESENT_REVISION specifies a valid revision, leave a not_present
- BASE node at local_abspath of the specified status and kind.
- (Requires an existing BASE node before removing)
-
If DESTROY_WC is TRUE, this operation *installs* workqueue operations to
update the local filesystem after the database operation. If DESTROY_CHANGES
is FALSE, modified and unversioned files are left after running this
@@ -3120,9 +3116,6 @@ svn_wc__db_op_remove_node(svn_boolean_t
const char *local_abspath,
svn_boolean_t destroy_wc,
svn_boolean_t destroy_changes,
- svn_revnum_t not_present_revision,
- svn_wc__db_status_t not_present_status,
- svn_node_kind_t not_present_kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
svn_cancel_func_t cancel_func,
