Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1717584 -
 /subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c
Date: Wed, 02 Dec 2015 08:34:12 -0000
To: commits@subversion.apache.org
From: rhuijben@apache.org
Message-Id: <20151202083412.BAF3D3A0056@svn01-us-west.apache.org>

Author: rhuijben
Date: Wed Dec  2 08:34:12 2015
New Revision: 1717584

URL: http://svn.apache.org/viewvc?rev=1717584&view=rev
Log:
On the ra-git branch: Fix the ra definitions to match the recent ra changes
on trunk.

* subversion/libsvn_ra_git/ra_plugin.c
  (svn_ra_git__session_baton_t): Add some vars.
  (svn_ra_git__set_svn_ra_open): New function.
  (svn_ra_git__get_commit_ev2): Remove function.
  (ra_git_vtable): Update table.

Modified:
    subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c

Modified: subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c?rev=1717584&r1=1717583&r2=1717584&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c Wed Dec  2 08:34:12 2015
@@ -50,6 +50,10 @@ typedef struct svn_ra_git__session_baton
 {
   /* The URL of the session. */
   const char *session_url;
+  const char *repos_root_url;
+
+  svn_ra_session_t *local_session;
+  const char *local_repos_root_url;
 
   /* The user accessing the repository. */
   const char *username;
@@ -83,6 +87,8 @@ typedef struct svn_ra_git__session_baton
 
   const char *useragent;
 
+  svn_ra__open_func_t svn_ra_open;
+
   /* Scratch pool for routines that cannot otherwise get one. */
   apr_pool_t *scratch_pool;
 
@@ -999,6 +1005,19 @@ svn_ra_git__open(svn_ra_session_t *sessi
 }
 
 static svn_error_t *
+svn_ra_git__set_svn_ra_open(svn_ra_session_t *session,
+                            svn_ra__open_func_t func)
+{
+  svn_ra_git__session_baton_t *sess = session->priv;
+
+  sess->svn_ra_open = func;
+
+  /* TODO: Open ra_local session, etc. */
+
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
 svn_ra_git__dup_session(svn_ra_session_t *new_session,
                         svn_ra_session_t *session,
                         const char *new_session_url,
@@ -2413,25 +2432,6 @@ svn_ra_git__register_editor_shim_callbac
 }
 
 
-static svn_error_t *
-svn_ra_git__get_commit_ev2(svn_editor_t **editor,
-                           svn_ra_session_t *session,
-                           apr_hash_t *revprops,
-                           svn_commit_callback2_t commit_cb,
-                           void *commit_baton,
-                           apr_hash_t *lock_tokens,
-                           svn_boolean_t keep_locks,
-                           svn_ra__provide_base_cb_t provide_base_cb,
-                           svn_ra__provide_props_cb_t provide_props_cb,
-                           svn_ra__get_copysrc_kind_cb_t get_copysrc_kind_cb,
-                           void *cb_baton,
-                           svn_cancel_func_t cancel_func,
-                           void *cancel_baton,
-                           apr_pool_t *result_pool,
-                           apr_pool_t *scratch_pool)
-{
-  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
-}
 
 /*----------------------------------------------------------------*/
 

@@ -2481,9 +2481,12 @@ static const svn_ra__vtable_t ra_git_vta
   svn_ra_git__has_capability,
   svn_ra_git__replay_range,
   svn_ra_git__get_deleted_rev,
-  svn_ra_git__register_editor_shim_callbacks,
   svn_ra_git__get_inherited_props,
-  svn_ra_git__get_commit_ev2
+  svn_ra_git__set_ra_open,
+
+  svn_ra_git__register_editor_shim_callbacks,
+  NULL /* get_commit_ev2 */,
+  NULL /* replay_range_ev2 */
 };