subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r918246 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Date Tue, 02 Mar 2010 23:09:54 GMT
Author: cmpilato
Date: Tue Mar  2 23:09:53 2010
New Revision: 918246

URL: http://svn.apache.org/viewvc?rev=918246&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
  (mark_tree_deleted): Replace usage of svn_wc_entry_t-slinging APIs
    with WC-NG hotness.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.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=918246&r1=918245&r2=918246&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Mar  2 23:09:53 2010
@@ -806,7 +806,7 @@
 {
   apr_pool_t *iterpool = svn_pool_create(pool);
   const apr_array_header_t *children;
-  const svn_wc_entry_t *entry;
+  svn_wc__db_status_t status;
   int i;
 
   /* Read the entries file for this directory. */
@@ -854,15 +854,18 @@
     }
 
   /* Handle "this dir" for states that need it done post-recursion. */
-  SVN_ERR(svn_wc__get_entry(&entry, db, dir_abspath, FALSE,
-                            svn_node_dir, FALSE, iterpool, iterpool));
-
+  SVN_ERR(svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
+                               NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                               NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                               NULL, NULL,
+                               db, dir_abspath, iterpool, iterpool));
   /* Uncommitted directories (schedule add) that are to be scheduled for
      deletion are a special case, they don't need to be changed as they
      will be removed from their parent's entry list.
      The files and directories are left on the disk in this special
      case, so KEEP_LOCAL doesn't need to be set either. */
-  if (entry->schedule != svn_wc_schedule_add)
+  if (!(status == svn_wc__db_status_added ||
+        status == svn_wc__db_status_obstructed_add))
     {
       SVN_ERR(svn_wc__db_temp_op_delete(db, dir_abspath, iterpool));
 



Mime
View raw message