Author: cmpilato
Date: Tue May 10 21:27:00 2011
New Revision: 1101652

URL: http://svn.apache.org/viewvc?rev=1101652&view=rev
Log:
Shave another 29.5K requests (26%) off of our ra_neon regression test
suite by using HTTPv2 semantics for calculating "baseline info"!

* subversion/libsvn_ra_neon/ra_neon.h
  (svn_ra_neon__get_baseline_info): Remove 'is_dir' parameter and handling.

* subversion/libsvn_ra_neon/props.c
  (svn_ra_neon__get_baseline_info): Remove 'is_dir' parameter and handling.
  (svn_ra_neon__do_check_path): Update call to
    svn_ra_neon__get_baseline_info(), and now do the is-dir work that
    that function used to do.
  (svn_ra_neon__do_stat): Update call to svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/fetch.c
  (svn_ra_neon__get_file, svn_ra_neon__get_dir, reporter_link_path):
    Update call to svn_ra_neon__get_baseline_info().
  (svn_ra_neon__get_latest_revnum): Update call to
    svn_ra_neon__get_baseline_info(), and now leave the HTTPv2 stuff
    to that function.

* subversion/libsvn_ra_neon/commit.c
  (get_version_url, copy_resource): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/file_revs.c
  (svn_ra_neon__get_file_revs): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/get_deleted_rev.c
  (svn_ra_neon__get_deleted_rev): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/get_location_segments.c
  (svn_ra_neon__get_location_segments): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/get_locations.c
  (svn_ra_neon__get_locations): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/lock.c
  (do_lock, svn_ra_neon__get_lock_internal): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/log.c
  (svn_ra_neon__get_log): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/mergeinfo.c
  (svn_ra_neon__get_mergeinfo): Update call to
    svn_ra_neon__get_baseline_info().

* subversion/libsvn_ra_neon/session.c
  (svn_ra_neon__get_repos_root): Update call to
    svn_ra_neon__get_baseline_info().

Modified:
    subversion/trunk/subversion/libsvn_ra_neon/commit.c
    subversion/trunk/subversion/libsvn_ra_neon/fetch.c
    subversion/trunk/subversion/libsvn_ra_neon/file_revs.c
    subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c
    subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c
    subversion/trunk/subversion/libsvn_ra_neon/get_locations.c
    subversion/trunk/subversion/libsvn_ra_neon/lock.c
    subversion/trunk/subversion/libsvn_ra_neon/log.c
    subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c
    subversion/trunk/subversion/libsvn_ra_neon/props.c
    subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
    subversion/trunk/subversion/libsvn_ra_neon/session.c

Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Tue May 10 21:27:00 2011
@@ -228,13 +228,9 @@ static svn_error_t * get_version_url(com
       svn_string_t bc_relative;
 
       /* The version URL comes from a resource in the Baseline Collection. */
-      SVN_ERR(svn_ra_neon__get_baseline_info(NULL,
-                                             &bc_url, &bc_relative, NULL,
-                                             cc->ras,
-                                             rsrc->url,
-                                             rsrc->revision,
-                                             pool));
-
+      SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL,
+                                             cc->ras, rsrc->url,
+                                             rsrc->revision, pool));
       url = svn_path_url_add_component2(bc_url.data, bc_relative.data, pool);
     }
 
@@ -593,7 +589,7 @@ static svn_error_t * copy_resource(svn_r
       /* Convert the copyfrom_* url/rev "public" pair into a Baseline
          Collection (BC) URL that represents the revision -- and a
          relative path under that BC.  */
-      SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
+      SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL,
                                              ras, copyfrom_path,
                                              copyfrom_revision, scratch_pool));
       baseline_coll_url = bc_url.data;

Modified: subversion/trunk/subversion/libsvn_ra_neon/fetch.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/fetch.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/fetch.c Tue May 10 21:27:00 2011
@@ -684,14 +684,9 @@ svn_error_t *svn_ra_neon__get_file(svn_r
       svn_revnum_t got_rev;
       svn_string_t bc_url, bc_relative;
 
-      SVN_ERR(svn_ra_neon__get_baseline_info(NULL,
-                                             &bc_url, &bc_relative,
-                                             &got_rev,
-                                             ras,
-                                             url, revision,
-                                             pool));
-      final_url = svn_path_url_add_component2(bc_url.data,
-                                              bc_relative.data,
+      SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, &got_rev,
+                                             ras, url, revision, pool));
+      final_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                               pool);
       if (fetched_rev != NULL)
         *fetched_rev = got_rev;
@@ -816,14 +811,9 @@ svn_error_t *svn_ra_neon__get_dir(svn_ra
       svn_revnum_t got_rev;
       svn_string_t bc_url, bc_relative;
 
-      SVN_ERR(svn_ra_neon__get_baseline_info(NULL,
-                                             &bc_url, &bc_relative,
-                                             &got_rev,
-                                             ras,
-                                             url, revision,
-                                             pool));
-      final_url = svn_path_url_add_component2(bc_url.data,
-                                              bc_relative.data,
+      SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, &got_rev,
+                                             ras, url, revision, pool));
+      final_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                               pool);
       if (fetched_rev != NULL)
         *fetched_rev = got_rev;
@@ -1093,29 +1083,9 @@ svn_error_t *svn_ra_neon__get_latest_rev
                                             apr_pool_t *pool)
 {
   svn_ra_neon__session_t *ras = session->priv;
-
-  /* If we detected HTTPv2 support, we can fetch the youngest revision
-     from a quick OPTIONS request instead of via a batch of
-     PROPFINDs. */
-  if (SVN_RA_NEON__HAVE_HTTPV2_SUPPORT(ras))
-    {
-      SVN_ERR(svn_ra_neon__exchange_capabilities(ras, NULL,
-                                                 latest_revnum, pool));
-      if (! SVN_IS_VALID_REVNUM(*latest_revnum))
-        return svn_error_create(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL,
-                                _("The OPTIONS response did not include "
-                                  "the youngest revision"));
-    }
-  else
-    {
-      /* We don't need any of the baseline URLs and stuff, but this
-         does give us the latest revision number.  */
-      SVN_ERR(svn_ra_neon__get_baseline_info(NULL, NULL, NULL, latest_revnum,
-                                             ras, ras->root.path,
-                                             SVN_INVALID_REVNUM, pool));
-    }
-
-  return NULL;
+  return svn_ra_neon__get_baseline_info(NULL, NULL, latest_revnum,
+                                        ras, ras->root.path,
+                                        SVN_INVALID_REVNUM, pool);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2344,10 +2314,8 @@ static svn_error_t * reporter_link_path(
   /* Convert the copyfrom_* url/rev "public" pair into a Baseline
      Collection (BC) URL that represents the revision -- and a
      relative path under that BC.  */
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, NULL, &bc_relative, NULL,
-                                         rb->ras,
-                                         url, revision,
-                                         pool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_relative, NULL, rb->ras,
+                                         url, revision, pool));
 
 
   svn_xml_escape_cdata_cstring(&qpath, path, pool);

Modified: subversion/trunk/subversion/libsvn_ra_neon/file_revs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/file_revs.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/file_revs.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/file_revs.c Tue May 10 21:27:00 
2011
@@ -356,9 +356,8 @@ svn_ra_neon__get_file_revs(svn_ra_sessio
      it as the main argument to the REPORT request; it might cause
      dav_get_resource() to choke on the server.  So instead, we pass a
      baseline-collection URL, which we get from END. */
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
-                                         ras, ras->url->data, end,
-                                         pool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                         ras->url->data, end, pool));
   final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                              pool);
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c Tue May 10 
21:27:00 2011
@@ -133,10 +133,8 @@ svn_ra_neon__get_deleted_rev(svn_ra_sess
      it as the main argument to the REPORT request; it might cause
      dav_get_resource() to choke on the server.  So instead, we pass a
      baseline-collection URL, which we get from the peg revision.  */
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
-                                         ras, ras->url->data,
-                                         peg_revision,
-                                         pool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                         ras->url->data, peg_revision, pool));
   final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                              pool);
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c 
(original)
+++ subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c Tue May 
10 21:27:00 2011
@@ -191,9 +191,9 @@ svn_ra_neon__get_location_segments(svn_r
      it as the main argument to the REPORT request; it might cause
      dav_get_resource() to choke on the server.  So instead, we pass a
      baseline-collection URL, which we get from the PEG_REVISION.  */
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
-                                         ras, ras->url->data,
-                                         peg_revision, subpool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                         ras->url->data, peg_revision,
+                                         subpool));
   bc = svn_path_url_add_component2(bc_url.data, bc_relative.data, subpool);
 
   err = svn_ra_neon__parsed_request(ras, "REPORT", bc,

Modified: subversion/trunk/subversion/libsvn_ra_neon/get_locations.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_locations.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/get_locations.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/get_locations.c Tue May 10 
21:27:00 2011
@@ -174,10 +174,8 @@ svn_ra_neon__get_locations(svn_ra_sessio
      it as the main argument to the REPORT request; it might cause
      dav_get_resource() to choke on the server.  So instead, we pass a
      baseline-collection URL, which we get from the peg revision.  */
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
-                                         ras, ras->url->data,
-                                         peg_revision,
-                                         pool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                         ras->url->data, peg_revision, pool));
   final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                              pool);
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/lock.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/lock.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/lock.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/lock.c Tue May 10 21:27:00 2011
@@ -251,7 +251,7 @@ do_lock(svn_lock_t **lock,
 
   /* To begin, we convert the incoming path into an absolute fs-path. */
   url = svn_path_url_add_component2(ras->url->data, path, pool);
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, NULL, &fs_path, NULL, ras,
+  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &fs_path, NULL, ras,
                                          url, SVN_INVALID_REVNUM, pool));
 
   if (ne_uri_parse(url, &uri) != 0)
@@ -559,7 +559,7 @@ svn_ra_neon__get_lock_internal(svn_ra_ne
   /* To begin, we convert the incoming path into an absolute fs-path. */
   url = svn_path_url_add_component2(ras->url->data, path, pool);
 
-  err = svn_ra_neon__get_baseline_info(NULL, NULL, &fs_path, NULL, ras,
+  err = svn_ra_neon__get_baseline_info(NULL, &fs_path, NULL, ras,
                                        url, SVN_INVALID_REVNUM, pool);
   SVN_ERR(svn_ra_neon__maybe_store_auth_info_after_result(err, ras, pool));
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/log.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/log.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/log.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/log.c Tue May 10 21:27:00 2011
@@ -501,9 +501,8 @@ svn_error_t * svn_ra_neon__get_log(svn_r
      baseline-collection URL, which we get from the largest of the
      START and END revisions. */
   use_rev = (start > end) ? start : end;
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
-                                         ras, ras->url->data, use_rev,
-                                         pool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                         ras->url->data, use_rev, pool));
   final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                              pool);
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/mergeinfo.c Tue May 10 21:27:00 
2011
@@ -246,9 +246,8 @@ svn_ra_neon__get_mergeinfo(svn_ra_sessio
      it as the main argument to the REPORT request; it might cause
      dav_get_resource() to choke on the server.  So instead, we pass a
      baseline-collection URL, which we get from END. */
-  SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
-                                         ras, ras->url->data, revision,
-                                         pool));
+  SVN_ERR(svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                         ras->url->data, revision, pool));
   final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
                                              pool);
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/props.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/props.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/props.c Tue May 10 21:27:00 2011
@@ -957,8 +957,7 @@ svn_error_t *svn_ra_neon__get_baseline_p
 }
 
 
-svn_error_t *svn_ra_neon__get_baseline_info(svn_boolean_t *is_dir,
-                                            svn_string_t *bc_url,
+svn_error_t *svn_ra_neon__get_baseline_info(svn_string_t *bc_url,
                                             svn_string_t *bc_relative,
                                             svn_revnum_t *latest_rev,
                                             svn_ra_neon__session_t *sess,
@@ -966,10 +965,48 @@ svn_error_t *svn_ra_neon__get_baseline_i
                                             svn_revnum_t revision,
                                             apr_pool_t *pool)
 {
-  svn_ra_neon__resource_t *baseline_rsrc, *rsrc;
+  svn_ra_neon__resource_t *baseline_rsrc;
   const svn_string_t *my_bc_url;
   svn_string_t my_bc_rel;
 
+  /* If the server supports HTTPv2, we can bypass alot of the hard
+     work here.  Otherwise, we fall back to older (less direct)
+     semantics.  */
+  if (SVN_RA_NEON__HAVE_HTTPV2_SUPPORT(sess))
+    {
+      svn_revnum_t youngest;
+
+      if (! SVN_IS_VALID_REVNUM(revision))
+        {
+          SVN_ERR(svn_ra_neon__exchange_capabilities(sess, NULL,
+                                                     &youngest, pool));
+          if (! SVN_IS_VALID_REVNUM(youngest))
+            return svn_error_create(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL,
+                                    _("The OPTIONS response did not include "
+                                      "the youngest revision"));
+          revision = youngest;
+        }
+      if (bc_url)
+        {
+          bc_url->data = apr_psprintf(pool, "%s/%ld", sess->rev_root_stub,
+                                      revision);
+          bc_url->len = strlen(bc_url->data);
+        }
+      if (bc_relative)
+        {
+          const char *relpath = svn_uri_is_child(sess->repos_root, url, pool);
+          if (! relpath)
+            relpath = "";
+          bc_relative->data = relpath;
+          bc_relative->len = strlen(relpath);
+        }
+      if (latest_rev)
+        {
+          *latest_rev = revision;
+        }
+      return SVN_NO_ERROR;
+    }
+
   /* Go fetch a BASELINE_RSRC that contains specific properties we
      want.  This routine will also fill in BC_RELATIVE as best it
      can. */
@@ -1020,17 +1057,6 @@ svn_error_t *svn_ra_neon__get_baseline_i
       *latest_rev = SVN_STR_TO_REV(vsn_name->data);
     }
 
-  if (is_dir != NULL)
-    {
-      /* query the DAV:resourcetype of the full, assembled URL. */
-      const char *full_bc_url = svn_path_url_add_component2(my_bc_url->data,
-                                                            my_bc_rel.data,
-                                                            pool);
-      SVN_ERR(svn_ra_neon__get_starting_props(&rsrc, sess, full_bc_url,
-                                              NULL, pool));
-      *is_dir = rsrc->is_collection;
-    }
-
   if (bc_relative)
     *bc_relative = my_bc_rel;
 
@@ -1253,10 +1279,11 @@ svn_ra_neon__do_check_path(svn_ra_sessio
 {
   svn_ra_neon__session_t *ras = session->priv;
   const char *url = ras->url->data;
+  svn_string_t bc_url, bc_relative;
   svn_error_t *err;
   svn_boolean_t is_dir;
 
-  /* ### For now, using svn_ra_neon__get_baseline_info() works because
+  /* ### For now, using svn_ra_neon__get_starting_props() works because
      we only have three possibilities: dir, file, or none.  When we
      add symlinks, we will need to do something different.  Here's one
      way described by Greg Stein:
@@ -1288,8 +1315,22 @@ svn_ra_neon__do_check_path(svn_ra_sessio
   if (path)
     url = svn_path_url_add_component2(url, path, pool);
 
-  err = svn_ra_neon__get_baseline_info(&is_dir, NULL, NULL, NULL,
-                                       ras, url, revision, pool);
+  err = svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
+                                       url, revision, pool);
+
+  if (! err)
+    {
+      svn_ra_neon__resource_t *rsrc;
+      const char *full_bc_url = svn_path_url_add_component2(bc_url.data,
+                                                            bc_relative.data,
+                                                            pool);
+
+      /* query the DAV:resourcetype of the full, assembled URL. */
+      err = svn_ra_neon__get_starting_props(&rsrc, ras, full_bc_url,
+                                            NULL, pool);
+      if (! err)
+        is_dir = rsrc->is_collection;
+    }
 
   if (err == SVN_NO_ERROR)
     {
@@ -1338,8 +1379,7 @@ svn_ra_neon__do_stat(svn_ra_session_t *s
       /* Else, convert (rev, path) into an opaque server-generated URL. */
       svn_string_t bc_url, bc_relative;
 
-      err = svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative,
-                                           NULL, ras,
+      err = svn_ra_neon__get_baseline_info(&bc_url, &bc_relative, NULL, ras,
                                            url, revision, pool);
       if (err)
         {

Modified: subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h Tue May 10 21:27:00 
2011
@@ -514,9 +514,6 @@ svn_error_t * svn_ra_neon__get_one_prop(
 
 /* Get various Baseline-related information for a given "public" URL.
 
-   Given a session SESS and a URL, return whether the URL is a
-   directory in *IS_DIR.  IS_DIR may be NULL if this flag is unneeded.
-
    REVISION may be SVN_INVALID_REVNUM to indicate that the operation
    should work against the latest (HEAD) revision, or whether it should
    return information about that specific revision.
@@ -540,8 +537,7 @@ svn_error_t * svn_ra_neon__get_one_prop(
    DeltaV baselines correspond one-to-one to Subversion revisions. Thus,
    the entire state of a revision can be found in a Baseline Collection.
 */
-svn_error_t *svn_ra_neon__get_baseline_info(svn_boolean_t *is_dir,
-                                            svn_string_t *bc_url,
+svn_error_t *svn_ra_neon__get_baseline_info(svn_string_t *bc_url,
                                             svn_string_t *bc_relative,
                                             svn_revnum_t *latest_rev,
                                             svn_ra_neon__session_t *sess,

Modified: subversion/trunk/subversion/libsvn_ra_neon/session.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/session.c?rev=1101652&r1=1101651&r2=1101652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/session.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/session.c Tue May 10 21:27:00 
2011
@@ -1116,8 +1116,8 @@ static svn_error_t *svn_ra_neon__get_rep
       svn_string_t bc_relative;
       svn_stringbuf_t *url_buf;
 
-      SVN_ERR(svn_ra_neon__get_baseline_info(NULL, NULL, &bc_relative,
-                                             NULL, ras, ras->url->data,
+      SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_relative, NULL,
+                                             ras, ras->url->data,
                                              SVN_INVALID_REVNUM, pool));
 
       /* Remove as many path components from the URL as there are components


Reply via email to