svn commit: r1035367 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c wc_db.h workqueue.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Nov 15 17:36:35 2010
New Revision: 1035367

URL: http://svn.apache.org/viewvc?rev=1035367&view=rev
Log:
Remove some WC comments and code that are obsoleted by single-db mode.

* subversion/libsvn_wc/adm_ops.c
  (check_can_add_to_parent): Remove a comment.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_to_relpath): Remove a comment.

* subversion/libsvn_wc/workqueue.c
  (svn_wc__wq_run): Remove some code.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/wc_db.h
    subversion/trunk/subversion/libsvn_wc/workqueue.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=1035367&r1=1035366&r2=1035367&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Nov 15 17:36:35 2010
@@ -807,8 +807,6 @@ check_can_add_to_parent(const char **rep
                                                  scratch_pool));
     }
   else if (parent_kind != svn_wc__db_kind_dir)
-    /* Can't happen until single db; but then it causes serious
-       trouble if we allow this. */
     return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
                              _("Can't schedule an addition of '%s'"
                                " below a not-directory node"),

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1035367&r1=1035366&r2=1035367&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Mon Nov 15 17:36:35 2010
@@ -355,9 +355,6 @@ svn_wc__db_init(svn_wc__db_t *db,
 
    LOCAL_RELPATH will be allocated in RESULT_POOL. All other (temporary)
    allocations will be made in SCRATCH_POOL.
-
-   ### note: with per-dir .svn directories, these relpaths will effectively
-   ### be the basename. it gets interesting in single-db mode
 */
 svn_error_t *
 svn_wc__db_to_relpath(const char **local_relpath,

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1035367&r1=1035366&r2=1035367&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Mon Nov 15 17:36:35 2010
@@ -2246,14 +2246,6 @@ svn_wc__wq_run(svn_wc__db_t *db,
 
       svn_pool_clear(iterpool);
 
-      /* ### right now, we expect WRI_ABSPATH to exist. this section should
-         ### disappear in single-db. also, note that db_wq_fetch() will
-         ### watch out for missing/obstructed subdirs (ie. wq is gone)  */
-      SVN_ERR(svn_wc__db_read_kind(&kind, db, wri_abspath, TRUE,
-                                   scratch_pool));
-      if (kind == svn_wc__db_kind_unknown)
-        break;
-
       SVN_ERR(svn_wc__db_wq_fetch(&id, &work_item, db, wri_abspath,
                                   iterpool, iterpool));
       if (work_item == NULL)