Author: stsp
Date: Mon Jul 4 15:18:06 2011
New Revision: 1142712
URL: http://svn.apache.org/viewvc?rev=1142712&view=rev
Log:
* subversion/libsvn_wc/wc-queries.sql
(STMT_HAS_ABSENT_NODES, STMT_SELECT_ALL_ABSENT_NODES): Rename to ...
(STMT_HAS_SERVER_EXCLUDED_NODES,
STMT_SELECT_ALL_SERVER_EXCLUDED_NODES): ... these, respectively,
as part of the absent -> server-excluded terminology change.
* subversion/libsvn_wc/wc_db.c
(catch_copy_of_absent, op_delete_txn,
svn_wc__db_get_absent_subtrees): Update users of renamed macros.
Modified:
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1142712&r1=1142711&r2=1142712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Mon Jul 4 15:18:06
2011
@@ -842,7 +842,7 @@ WHERE wc_id = ?1
SELECT 1 FROM nodes WHERE wc_id = ?1 AND local_relpath = ?2
LIMIT 1
--- STMT_HAS_ABSENT_NODES
+-- STMT_HAS_SERVER_EXCLUDED_NODES
SELECT local_relpath FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
@@ -851,8 +851,8 @@ WHERE wc_id = ?1
AND op_depth = 0 AND presence = 'absent'
LIMIT 1
-/* ### Select all absent nodes. */
--- STMT_SELECT_ALL_ABSENT_NODES
+/* ### Select all server-excluded nodes. */
+-- STMT_SELECT_ALL_SERVER_EXCLUDED_NODES
SELECT local_relpath FROM nodes
WHERE wc_id = ?1
AND (?2 = ''
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1142712&r1=1142711&r2=1142712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 4 15:18:06 2011
@@ -4032,7 +4032,7 @@ catch_copy_of_absent(svn_wc__db_wcroot_t
const char *absent_relpath;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_HAS_ABSENT_NODES));
+ STMT_HAS_SERVER_EXCLUDED_NODES));
SVN_ERR(svn_sqlite__bindf(stmt, "is",
wcroot->wc_id,
local_relpath));
@@ -6050,7 +6050,7 @@ op_delete_txn(void *baton,
return SVN_NO_ERROR;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_HAS_ABSENT_NODES));
+ STMT_HAS_SERVER_EXCLUDED_NODES));
SVN_ERR(svn_sqlite__bindf(stmt, "is",
wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
@@ -11743,7 +11743,7 @@ svn_wc__db_get_absent_subtrees(apr_hash_
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_SELECT_ALL_ABSENT_NODES));
+ STMT_SELECT_ALL_SERVER_EXCLUDED_NODES));
SVN_ERR(svn_sqlite__bindf(stmt, "is",
wcroot->wc_id,
local_relpath));
