subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1327806 - /subversion/trunk/subversion/libsvn_client/commit.c
Date Thu, 19 Apr 2012 03:56:25 GMT
Author: hwright
Date: Thu Apr 19 03:56:25 2012
New Revision: 1327806

URL: http://svn.apache.org/viewvc?rev=1327806&view=rev
Log:
* subversion/libsvn_client/commit.c
  (svn_client_import5): Include the relevant parts of get_ra_editor() inline.

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

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1327806&r1=1327805&r2=1327806&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Thu Apr 19 03:56:25 2012
@@ -742,6 +742,7 @@ svn_client_import5(const char *path,
                                                    sizeof(const char *));
   const char *temp;
   const char *dir;
+  apr_hash_t *commit_revprops;
   apr_pool_t *iterpool = svn_pool_create(scratch_pool);
 
   if (svn_path_is_url(path))
@@ -809,10 +810,6 @@ svn_client_import5(const char *path,
                                 iterpool));
     }
 
-  SVN_ERR(get_ra_editor(&editor, &edit_baton, ra_session, ctx, log_msg, NULL,
-                        revprop_table, NULL, TRUE,
-                        commit_callback, commit_baton, iterpool));
-
   /* Reverse the order of the components we added to our NEW_ENTRIES array. */
   if (new_entries->nelts)
     {
@@ -846,6 +843,17 @@ svn_client_import5(const char *path,
        _("'%s' is a reserved name and cannot be imported"),
        svn_dirent_local_style(temp, scratch_pool));
 
+  SVN_ERR(svn_client__ensure_revprop_table(&commit_revprops, revprop_table,
+                                           log_msg, ctx, scratch_pool));
+
+  /* Fetch RA commit editor. */
+  SVN_ERR(svn_ra__register_editor_shim_callbacks(ra_session,
+                        svn_client__get_shim_callbacks(ctx->wc_ctx,
+                                                       NULL, scratch_pool)));
+  SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton,
+                                    commit_revprops, commit_callback,
+                                    commit_baton, NULL, TRUE,
+                                    scratch_pool));
 
   /* If an error occurred during the commit, abort the edit and return
      the error.  We don't even care if the abort itself fails.  */



Mime
View raw message