subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1131986 - /subversion/trunk/subversion/libsvn_wc/entries.c
Date Sun, 05 Jun 2011 07:52:57 GMT
Author: rhuijben
Date: Sun Jun  5 07:52:57 2011
New Revision: 1131986

URL: http://svn.apache.org/viewvc?rev=1131986&view=rev
Log:
Restore a bit more compatibility for api-users that use svn_wc_entry_t by
filling has_props and has_prop_mods with the existing call to
svn_wc__db_read_info().

We never documented that these fields could/would be always FALSE and
we don't have to perform extra database queries to obtain the values.

* subversion/libsvn_wc/entries.c
  (read_one_entry): Fill two more svn_wc_entry_t fields.

Modified:
    subversion/trunk/subversion/libsvn_wc/entries.c

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1131986&r1=1131985&r2=1131986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Sun Jun  5 07:52:57 2011
@@ -403,8 +403,8 @@ read_one_entry(const svn_wc_entry_t **ne
             &entry->changelist,
             &conflicted,
             NULL /* op_root */,
-            NULL /* have_props */,
-            NULL /* props_mod */,
+            &entry->has_props /* have_props */,
+            &entry->has_prop_mods /* props_mod */,
             &have_base,
             &have_more_work,
             NULL /* have_work */,
@@ -413,6 +413,9 @@ read_one_entry(const svn_wc_entry_t **ne
             result_pool,
             scratch_pool));
 
+  if (entry->has_prop_mods)
+    entry->has_props = TRUE;
+
   if (strcmp(entry->name, SVN_WC_ENTRY_THIS_DIR) == 0)
     {
       /* get the tree conflict data. */



Mime
View raw message