You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2013/01/08 17:58:40 UTC
svn commit: r1430386 - in /subversion/trunk/subversion: include/
include/private/ libsvn_client/ libsvn_delta/ libsvn_fs/ libsvn_ra/
libsvn_ra_svn/ libsvn_repos/ libsvn_wc/ svnrdump/
Author: cmpilato
Date: Tue Jan 8 16:58:39 2013
New Revision: 1430386
URL: http://svn.apache.org/viewvc?rev=1430386&view=rev
Log:
Privatize Editor v2. (Sadly, this isn't a U.S.-government-reducing
change.)
* subversion/include/svn_editor.h
Rename this...
* subversion/include/private/svn_editor.h
... to this. Also...
(svn_editor__insert_shims): Move here from svn_delta.h.
* subversion/include/svn_fs.h
(svn_fs_editor_create, svn_fs_editor_create_for,
svn_fs_editor_commit): Moved and renamed these...
* subversion/include/private/svn_fs_private.h
(svn_fs__editor_create, svn_fs__editor_create_for,
svn_fs__editor_commit): ... to these.
* subversion/include/svn_delta.h
(svn_editor__insert_shims): Moved to svn_editor.h. (Not sure why it
didn't live there already...)
* subversion/libsvn_client/repos_diff.c,
* subversion/libsvn_delta/editor.c,
* subversion/libsvn_fs/editor.c,
* subversion/libsvn_ra/deprecated.h,
* subversion/libsvn_ra/editor.c,
* subversion/libsvn_ra_svn/editorp.c,
* subversion/libsvn_repos/commit.c,
* subversion/libsvn_wc/diff_editor.c,
* subversion/libsvn_wc/status.c,
* subversion/libsvn_wc/update_editor.c,
* subversion/libsvn_wc/wc_db_update_move.c,
* subversion/svnrdump/dump_editor.c,
* subversion/svnrdump/svnrdump.h
Adjust #includes and track renamed functions per the above.
Added:
subversion/trunk/subversion/include/private/svn_editor.h
- copied, changed from r1430312, subversion/trunk/subversion/include/svn_editor.h
Removed:
subversion/trunk/subversion/include/svn_editor.h
Modified:
subversion/trunk/subversion/include/private/svn_fs_private.h
subversion/trunk/subversion/include/svn_delta.h
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_delta/editor.c
subversion/trunk/subversion/libsvn_fs/editor.c
subversion/trunk/subversion/libsvn_ra/deprecated.h
subversion/trunk/subversion/libsvn_ra/editor.c
subversion/trunk/subversion/libsvn_ra_svn/editorp.c
subversion/trunk/subversion/libsvn_repos/commit.c
subversion/trunk/subversion/libsvn_wc/diff_editor.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
subversion/trunk/subversion/svnrdump/dump_editor.c
subversion/trunk/subversion/svnrdump/svnrdump.h
Copied: subversion/trunk/subversion/include/private/svn_editor.h (from r1430312, subversion/trunk/subversion/include/svn_editor.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_editor.h?p2=subversion/trunk/subversion/include/private/svn_editor.h&p1=subversion/trunk/subversion/include/svn_editor.h&r1=1430312&r2=1430386&rev=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_editor.h (original)
+++ subversion/trunk/subversion/include/private/svn_editor.h Tue Jan 8 16:58:39 2013
@@ -32,6 +32,7 @@
#include "svn_types.h"
#include "svn_error.h"
#include "svn_io.h" /* for svn_stream_t */
+#include "svn_delta.h"
#ifdef __cplusplus
extern "C" {
@@ -1086,6 +1087,28 @@ svn_editor_abort(svn_editor_t *editor);
/** @} */
+/** A temporary API which conditionally inserts a double editor shim
+ * into the chain of delta editors. Used for testing Editor v2.
+ *
+ * Whether or not the shims are inserted is controlled by a compile-time
+ * option in libsvn_delta/compat.c.
+ *
+ * @note The use of these shims and this API will likely cause all kinds
+ * of performance degredation. (Which is actually a moot point since they
+ * don't even work properly yet anyway.)
+ */
+svn_error_t *
+svn_editor__insert_shims(const svn_delta_editor_t **deditor_out,
+ void **dedit_baton_out,
+ const svn_delta_editor_t *deditor_in,
+ void *dedit_baton_in,
+ const char *repos_root,
+ const char *base_dir,
+ svn_delta_shim_callbacks_t *shim_callbacks,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/include/private/svn_fs_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fs_private.h?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fs_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_fs_private.h Tue Jan 8 16:58:39 2013
@@ -26,6 +26,7 @@
#define SVN_FS_PRIVATE_H
#include "svn_fs.h"
+#include "private/svn_editor.h"
#ifdef __cplusplus
extern "C" {
@@ -67,6 +68,120 @@ svn_fs__access_get_lock_tokens(svn_fs_ac
svn_error_t *
svn_fs__path_valid(const char *path, apr_pool_t *pool);
+
+
+/** Editors
+ *
+ * ### docco
+ *
+ * @defgroup svn_fs_editor Transaction editors
+ * @{
+ */
+
+/**
+ * Create a new filesystem transaction, based on based on the youngest
+ * revision of @a fs, and return its name @a *txn_name and an @a *editor
+ * that can be used to make changes into it.
+ *
+ * @a flags determines transaction enforcement behaviors, and is composed
+ * from the constants SVN_FS_TXN_* (#SVN_FS_TXN_CHECK_OOD etc.). It is a
+ * property of the underlying transaction, and will not change if multiple
+ * editors are used to refer to that transaction (see @a autocommit, below).
+ *
+ * @note If you're building a txn for committing, you probably don't want
+ * to call this directly. Instead, call svn_repos__get_commit_ev2(), which
+ * honors the repository's hook configurations.
+ *
+ * When svn_editor_complete() is called for @a editor, internal resources
+ * will be cleaned and nothing more will happen. If you wish to commit the
+ * transaction, call svn_fs_editor_commit() instead. It is illegal to call
+ * both; the second call will return #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION.
+ *
+ * @see svn_fs_commit_txn()
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs__editor_create(svn_editor_t **editor,
+ const char **txn_name,
+ svn_fs_t *fs,
+ apr_uint32_t flags,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
+/**
+ * Like svn_fs__editor_create(), but open an existing transaction
+ * @a txn_name and continue editing it.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs__editor_create_for(svn_editor_t **editor,
+ svn_fs_t *fs,
+ const char *txn_name,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
+/**
+ * Commit the transaction represented by @a editor.
+ *
+ * If the commit to the filesystem succeeds, then @a *revision will be set
+ * to the resulting revision number. Note that further errors may occur,
+ * as described below. If the commit process does not succeed, for whatever
+ * reason, then @a *revision will be set to #SVN_INVALID_REVNUM.
+ *
+ * If a conflict occurs during the commit, then @a *conflict_path will
+ * be set to a path that caused the conflict. #SVN_NO_ERROR will be returned.
+ * Callers may want to construct an #SVN_ERR_FS_CONFLICT error with a
+ * message that incorporates @a *conflict_path.
+ *
+ * If a non-conflict error occurs during the commit, then that error will
+ * be returned.
+ * As is standard with any Subversion API, @a revision, @a post_commit_err,
+ * and @a conflict_path (the OUT parameters) have an indeterminate value if
+ * an error is returned.
+ *
+ * If the commit completes (and a revision is returned in @a *revision), then
+ * it is still possible for an error to occur during the cleanup process.
+ * Any such error will be returned in @a *post_commit_err. The caller must
+ * properly use or clear that error.
+ *
+ * If svn_editor_complete() has already been called on @a editor, then
+ * #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION will be returned.
+ *
+ * @note After calling this function, @a editor will be marked as completed
+ * and no further operations may be performed on it. The underlying
+ * transaction will either be committed or aborted once this function is
+ * called. It cannot be recovered for additional work.
+ *
+ * @a result_pool will be used to allocate space for @a conflict_path.
+ * @a scratch_pool will be used for all temporary allocations.
+ *
+ * @note To summarize, there are three possible outcomes of this function:
+ * successful commit (with or without an associated @a *post_commit_err);
+ * failed commit due to a conflict (reported via @a *conflict_path); and
+ * failed commit for some other reason (reported via the returned error.)
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs__editor_commit(svn_revnum_t *revision,
+ svn_error_t **post_commit_err,
+ const char **conflict_path,
+ svn_editor_t *editor,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
+/** @} */
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Tue Jan 8 16:58:39 2013
@@ -41,7 +41,6 @@
#include "svn_string.h"
#include "svn_io.h"
#include "svn_checksum.h"
-#include "svn_editor.h"
#ifdef __cplusplus
extern "C" {
@@ -1184,29 +1183,6 @@ svn_delta_shim_callbacks_t *
svn_delta_shim_callbacks_default(apr_pool_t *result_pool);
-/** A temporary API which conditionally inserts a double editor shim
- * into the chain of delta editors. Used for testing Editor v2.
- *
- * Whether or not the shims are inserted is controlled by a compile-time
- * option in libsvn_delta/compat.c.
- *
- * @note The use of these shims and this API will likely cause all kinds
- * of performance degredation. (Which is actually a moot point since they
- * don't even work properly yet anyway.)
- *
- * ### This should not ship in the final release.
- */
-svn_error_t *
-svn_editor__insert_shims(const svn_delta_editor_t **deditor_out,
- void **dedit_baton_out,
- const svn_delta_editor_t *deditor_in,
- void *dedit_baton_in,
- const char *repos_root,
- const char *base_dir,
- svn_delta_shim_callbacks_t *shim_callbacks,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/** A text-delta window handler which does nothing.
*
* Editors can return this handler from @c apply_textdelta if they don't
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Tue Jan 8 16:58:39 2013
@@ -39,7 +39,6 @@
#include "svn_io.h"
#include "svn_mergeinfo.h"
#include "svn_checksum.h"
-#include "svn_editor.h"
#ifdef __cplusplus
@@ -1059,118 +1058,6 @@ svn_fs_change_txn_props(svn_fs_txn_t *tx
/** @} */
-/** Editors
- *
- * ### docco
- *
- * @defgroup svn_fs_editor Transaction editors
- * @{
- */
-
-/**
- * Create a new filesystem transaction, based on based on the youngest
- * revision of @a fs, and return its name @a *txn_name and an @a *editor
- * that can be used to make changes into it.
- *
- * @a flags determines transaction enforcement behaviors, and is composed
- * from the constants SVN_FS_TXN_* (#SVN_FS_TXN_CHECK_OOD etc.). It is a
- * property of the underlying transaction, and will not change if multiple
- * editors are used to refer to that transaction (see @a autocommit, below).
- *
- * @note If you're building a txn for committing, you probably don't want
- * to call this directly. Instead, call svn_repos__get_commit_ev2(), which
- * honors the repository's hook configurations.
- *
- * When svn_editor_complete() is called for @a editor, internal resources
- * will be cleaned and nothing more will happen. If you wish to commit the
- * transaction, call svn_fs_editor_commit() instead. It is illegal to call
- * both; the second call will return #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION.
- *
- * @see svn_fs_commit_txn()
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_editor_create(svn_editor_t **editor,
- const char **txn_name,
- svn_fs_t *fs,
- apr_uint32_t flags,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/**
- * Like svn_fs_editor_create(), but open an existing transaction
- * @a txn_name and continue editing it.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_editor_create_for(svn_editor_t **editor,
- svn_fs_t *fs,
- const char *txn_name,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/**
- * Commit the transaction represented by @a editor.
- *
- * If the commit to the filesystem succeeds, then @a *revision will be set
- * to the resulting revision number. Note that further errors may occur,
- * as described below. If the commit process does not succeed, for whatever
- * reason, then @a *revision will be set to #SVN_INVALID_REVNUM.
- *
- * If a conflict occurs during the commit, then @a *conflict_path will
- * be set to a path that caused the conflict. #SVN_NO_ERROR will be returned.
- * Callers may want to construct an #SVN_ERR_FS_CONFLICT error with a
- * message that incorporates @a *conflict_path.
- *
- * If a non-conflict error occurs during the commit, then that error will
- * be returned.
- * As is standard with any Subversion API, @a revision, @a post_commit_err,
- * and @a conflict_path (the OUT parameters) have an indeterminate value if
- * an error is returned.
- *
- * If the commit completes (and a revision is returned in @a *revision), then
- * it is still possible for an error to occur during the cleanup process.
- * Any such error will be returned in @a *post_commit_err. The caller must
- * properly use or clear that error.
- *
- * If svn_editor_complete() has already been called on @a editor, then
- * #SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION will be returned.
- *
- * @note After calling this function, @a editor will be marked as completed
- * and no further operations may be performed on it. The underlying
- * transaction will either be committed or aborted once this function is
- * called. It cannot be recovered for additional work.
- *
- * @a result_pool will be used to allocate space for @a conflict_path.
- * @a scratch_pool will be used for all temporary allocations.
- *
- * @note To summarize, there are three possible outcomes of this function:
- * successful commit (with or without an associated @a *post_commit_err);
- * failed commit due to a conflict (reported via @a *conflict_path); and
- * failed commit for some other reason (reported via the returned error.)
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_editor_commit(svn_revnum_t *revision,
- svn_error_t **post_commit_err,
- const char **conflict_path,
- svn_editor_t *editor,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/** @} */
-
-
/** Roots.
*
* An #svn_fs_root_t object represents the root directory of some
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Tue Jan 8 16:58:39 2013
@@ -49,6 +49,7 @@
#include "private/svn_subr_private.h"
#include "private/svn_wc_private.h"
+#include "private/svn_editor.h"
/* Overall crawler editor baton. */
struct edit_baton {
Modified: subversion/trunk/subversion/libsvn_delta/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/editor.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/editor.c Tue Jan 8 16:58:39 2013
@@ -26,9 +26,10 @@
#include "svn_types.h"
#include "svn_error.h"
#include "svn_pools.h"
-#include "svn_editor.h"
#include "svn_dirent_uri.h"
+#include "private/svn_editor.h"
+
#ifdef SVN_DEBUG
/* This enables runtime checks of the editor API constraints. This may
introduce additional memory and runtime overhead, and should not be used
Modified: subversion/trunk/subversion/libsvn_fs/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/editor.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/editor.c (original)
+++ subversion/trunk/subversion/libsvn_fs/editor.c Tue Jan 8 16:58:39 2013
@@ -26,7 +26,6 @@
#include "svn_types.h"
#include "svn_error.h"
#include "svn_pools.h"
-#include "svn_editor.h"
#include "svn_fs.h"
#include "svn_props.h"
@@ -35,6 +34,8 @@
#include "fs-loader.h"
#include "private/svn_fspath.h"
+#include "private/svn_fs_private.h"
+#include "private/svn_editor.h"
struct edit_baton {
@@ -732,14 +733,14 @@ make_editor(svn_editor_t **editor,
svn_error_t *
-svn_fs_editor_create(svn_editor_t **editor,
- const char **txn_name,
- svn_fs_t *fs,
- apr_uint32_t flags,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_fs__editor_create(svn_editor_t **editor,
+ const char **txn_name,
+ svn_fs_t *fs,
+ apr_uint32_t flags,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_revnum_t revision;
svn_fs_txn_t *txn;
@@ -754,13 +755,13 @@ svn_fs_editor_create(svn_editor_t **edit
svn_error_t *
-svn_fs_editor_create_for(svn_editor_t **editor,
- svn_fs_t *fs,
- const char *txn_name,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_fs__editor_create_for(svn_editor_t **editor,
+ svn_fs_t *fs,
+ const char *txn_name,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_fs_txn_t *txn;
@@ -772,12 +773,12 @@ svn_fs_editor_create_for(svn_editor_t **
svn_error_t *
-svn_fs_editor_commit(svn_revnum_t *revision,
- svn_error_t **post_commit_err,
- const char **conflict_path,
- svn_editor_t *editor,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_fs__editor_commit(svn_revnum_t *revision,
+ svn_error_t **post_commit_err,
+ const char **conflict_path,
+ svn_editor_t *editor,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
struct edit_baton *eb = svn_editor_get_baton(editor);
const char *inner_conflict_path;
Modified: subversion/trunk/subversion/libsvn_ra/deprecated.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/deprecated.h?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/deprecated.h (original)
+++ subversion/trunk/subversion/libsvn_ra/deprecated.h Tue Jan 8 16:58:39 2013
@@ -28,7 +28,8 @@
#include <apr_hash.h>
-#include "svn_editor.h"
+#include "private/svn_editor.h"
+
#ifdef __cplusplus
extern "C" {
Modified: subversion/trunk/subversion/libsvn_ra/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/editor.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/editor.c (original)
+++ subversion/trunk/subversion/libsvn_ra/editor.c Tue Jan 8 16:58:39 2013
@@ -27,11 +27,11 @@
#include "svn_pools.h"
#include "svn_ra.h"
#include "svn_delta.h"
-#include "svn_editor.h"
#include "svn_dirent_uri.h"
#include "private/svn_ra_private.h"
#include "private/svn_delta_private.h"
+#include "private/svn_editor.h"
#include "ra_loader.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Tue Jan 8 16:58:39 2013
@@ -39,6 +39,7 @@
#include "svn_private_config.h"
#include "private/svn_fspath.h"
+#include "private/svn_editor.h"
#include "ra_svn.h"
Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Tue Jan 8 16:58:39 2013
@@ -38,12 +38,13 @@
#include "svn_props.h"
#include "svn_mergeinfo.h"
#include "svn_private_config.h"
-#include "svn_editor.h"
#include "repos.h"
#include "private/svn_fspath.h"
+#include "private/svn_fs_private.h"
#include "private/svn_repos_private.h"
+#include "private/svn_editor.h"
@@ -1226,8 +1227,8 @@ complete_cb(void *baton,
SVN_ERR(svn_repos__hooks_pre_commit(eb->repos, eb->txn_name, scratch_pool));
/* Hook is done. Let's do the actual commit. */
- SVN_ERR(svn_fs_editor_commit(&revision, &post_commit_err, &conflict_path,
- eb->inner, scratch_pool, scratch_pool));
+ SVN_ERR(svn_fs__editor_commit(&revision, &post_commit_err, &conflict_path,
+ eb->inner, scratch_pool, scratch_pool));
/* Did a conflict occur during the commit process? */
if (conflict_path != NULL)
@@ -1345,10 +1346,10 @@ svn_repos__get_commit_ev2(svn_editor_t *
eb->commit_cb = commit_cb;
eb->commit_baton = commit_baton;
- SVN_ERR(svn_fs_editor_create(&eb->inner, &eb->txn_name,
- repos->fs, SVN_FS_TXN_CHECK_LOCKS,
- cancel_func, cancel_baton,
- result_pool, scratch_pool));
+ SVN_ERR(svn_fs__editor_create(&eb->inner, &eb->txn_name,
+ repos->fs, SVN_FS_TXN_CHECK_LOCKS,
+ cancel_func, cancel_baton,
+ result_pool, scratch_pool));
/* The TXN has been created. Go ahead and apply all revision properties. */
SVN_ERR(apply_revprops(repos->fs, eb->txn_name, revprops, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Tue Jan 8 16:58:39 2013
@@ -63,6 +63,7 @@
#include "private/svn_subr_private.h"
#include "private/svn_wc_private.h"
+#include "private/svn_editor.h"
#include "wc.h"
#include "props.h"
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Jan 8 16:58:39 2013
@@ -53,6 +53,7 @@
#include "private/svn_wc_private.h"
#include "private/svn_fspath.h"
+#include "private/svn_editor.h"
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jan 8 16:58:39 2013
@@ -51,6 +51,8 @@
#include "private/svn_subr_private.h"
#include "private/svn_wc_private.h"
+#include "private/svn_editor.h"
+
/* Checks whether a svn_wc__db_status_t indicates whether a node is
present in a working copy. Used by the editor implementation */
#define IS_NODE_PRESENT(status) \
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Jan 8 16:58:39 2013
@@ -73,7 +73,6 @@
#include "svn_checksum.h"
#include "svn_dirent_uri.h"
-#include "svn_editor.h"
#include "svn_error.h"
#include "svn_hash.h"
#include "svn_wc.h"
@@ -83,6 +82,7 @@
#include "private/svn_skel.h"
#include "private/svn_sqlite.h"
#include "private/svn_wc_private.h"
+#include "private/svn_editor.h"
#include "wc.h"
#include "props.h"
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Tue Jan 8 16:58:39 2013
@@ -31,6 +31,7 @@
#include "svn_dirent_uri.h"
#include "private/svn_subr_private.h"
+#include "private/svn_editor.h"
#include "svnrdump.h"
#include <assert.h>
Modified: subversion/trunk/subversion/svnrdump/svnrdump.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.h?rev=1430386&r1=1430385&r2=1430386&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.h (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.h Tue Jan 8 16:58:39 2013
@@ -32,6 +32,8 @@
#include "svn_delta.h"
#include "svn_ra.h"
+#include "private/svn_editor.h"
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */