Author: ivan
Date: Tue May 17 08:49:11 2011
New Revision: 1104057

URL: http://svn.apache.org/viewvc?rev=1104057&view=rev
Log:
* subversion/libsvn_ra_neon/fetch.c
  (svn_ra_neon__rev_proplist): Simplify the code by using 
   svn_ra_neon__get_vcc() function instead of overloaded and complex 
   svn_ra_neon__get_baseline_props().

Modified:
    subversion/trunk/subversion/libsvn_ra_neon/fetch.c

Modified: subversion/trunk/subversion/libsvn_ra_neon/fetch.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/fetch.c?rev=1104057&r1=1104056&r2=1104057&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/fetch.c Tue May 17 08:49:11 2011
@@ -1190,6 +1190,8 @@ svn_error_t *svn_ra_neon__rev_proplist(s
 {
   svn_ra_neon__session_t *ras = session->priv;
   svn_ra_neon__resource_t *bln;
+  const char *label;
+  const char *url;
 
   *props = apr_hash_make(pool);
 
@@ -1199,16 +1201,18 @@ svn_error_t *svn_ra_neon__rev_proplist(s
      in these functions because we want 'em all.)  */
   if (SVN_RA_NEON__HAVE_HTTPV2_SUPPORT(ras))
     {
-      const char *url = apr_psprintf(pool, "%s/%ld", ras->rev_stub, rev);
-      SVN_ERR(svn_ra_neon__get_props_resource(&bln, ras, url,
-                                              NULL, NULL, pool));
+      url = apr_psprintf(pool, "%s/%ld", ras->rev_stub, rev);
+      label = NULL;
     }
   else
     {
-      SVN_ERR(svn_ra_neon__get_baseline_props(NULL, &bln, ras, ras->url->data,
-                                              rev, NULL, pool));
+      SVN_ERR(svn_ra_neon__get_vcc(&url, ras, ras->url->data, pool));
+      label = apr_psprintf(pool, "%ld", rev);
     }
 
+    SVN_ERR(svn_ra_neon__get_props_resource(&bln, ras, url,
+                                            label, NULL, pool));
+
   /* Build a new property hash, based on the one in the baseline
      resource.  In particular, convert the xml-property-namespaces
      into ones that the client understands.  Strip away the DAV:


Reply via email to