svn commit: r899809 - /subversion/trunk/subversion/libsvn_client/prop_commands.c

[hw...@apache.org]

Author: hwright
Date: Fri Jan 15 20:47:12 2010
New Revision: 899809

URL: http://svn.apache.org/viewvc?rev=899809&view=rev
Log:
* subversion/libsvn_client/prop_commands.c
  (proplist_walk_cb): Abandon an entry in favor of a couple of wc node APIs.

Modified:
    subversion/trunk/subversion/libsvn_client/prop_commands.c

Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=899809&r1=899808&r2=899809&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Fri Jan 15 20:47:12 2010
@@ -1100,18 +1100,28 @@
                  apr_pool_t *scratch_pool)
 {
   struct proplist_walk_baton *wb = walk_baton;
-  const svn_wc_entry_t *entry;
   apr_hash_t *hash;
   const char *path;
 
-  SVN_ERR(svn_wc__get_entry_versioned(&entry, wb->wc_ctx, local_abspath,
-                                      svn_node_unknown, FALSE, FALSE,
-                                      scratch_pool, scratch_pool));
-
   /* Ignore the entry if it does not exist at the time of interest. */
-  if (entry->schedule
-      == (wb->pristine ? svn_wc_schedule_add : svn_wc_schedule_delete))
-    return SVN_NO_ERROR;
+  if (wb->pristine)
+    {
+      svn_boolean_t added;
+
+      SVN_ERR(svn_wc__node_is_status_added(&added, wb->wc_ctx, local_abspath,
+                                           scratch_pool));
+      if (added)
+        return SVN_NO_ERROR;
+    }
+  else
+    {
+      svn_boolean_t deleted;
+
+      SVN_ERR(svn_wc__node_is_status_delete(&deleted, wb->wc_ctx,
+                                            local_abspath, scratch_pool));
+      if (deleted)
+        return SVN_NO_ERROR;
+    }
 
   /* If our entry doesn't pass changelist filtering, get outta here. */
   if (! svn_wc__changelist_match(wb->wc_ctx, local_abspath,