subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1607901 - in /subversion/branches/remove-log-addressing: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/tests/org/apache/subversion/javahl/ subversion/include/ subversion/libsvn_client/ subversion/libsvn_delta/ subversion...
Date Fri, 04 Jul 2014 18:07:19 GMT
Author: ivan
Date: Fri Jul  4 18:07:18 2014
New Revision: 1607901

URL: http://svn.apache.org/r1607901
Log:
On remove-log-addressing branch: Merge changes from trunk.

Modified:
    subversion/branches/remove-log-addressing/   (props changed)
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
    subversion/branches/remove-log-addressing/subversion/include/svn_repos.h
    subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c
    subversion/branches/remove-log-addressing/subversion/libsvn_delta/xdelta.c
    subversion/branches/remove-log-addressing/subversion/libsvn_diff/binary_diff.c
    subversion/branches/remove-log-addressing/subversion/libsvn_diff/diff_file.c
    subversion/branches/remove-log-addressing/subversion/libsvn_diff/lcs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/bdb/strings-table.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/dag.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/rev_file.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf_width.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/questions.c
    subversion/branches/remove-log-addressing/subversion/svn/copy-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/merge-cmd.c
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/atomic-ra-revprop-change.c
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/basic_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/main.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py

Propchange: subversion/branches/remove-log-addressing/
------------------------------------------------------------------------------
  Merged /subversion/branches/move-tracking-2:r1607334
  Merged /subversion/trunk:r1606678-1607900

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp Fri Jul  4 18:07:18 2014
@@ -1178,7 +1178,7 @@ void fill_property_map(jobject map,
     {
       for (int i = 0; i < prop_diffs->nelts; ++i)
         {
-          svn_prop_t* prop = APR_ARRAY_IDX(prop_diffs, i, svn_prop_t*);
+          svn_prop_t* prop = &APR_ARRAY_IDX(prop_diffs, i, svn_prop_t);
           loop_body(prop->name, prop->value);
           if (JNIUtil::isJavaExceptionThrown())
             POP_AND_RETURN_NOTHING();

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp Fri Jul  4 18:07:18 2014
@@ -71,7 +71,8 @@ RemoteSession::open(jint jretryAttempts,
                     jobject jprompter, jobject jdeprecatedPrompter,
                     jobject jprogress, jobject jcfgcb, jobject jtunnelcb)
 {
-  SVN_ERR_ASSERT_NO_RETURN(!jprompter != !jdeprecatedPrompter);
+  SVN_ERR_ASSERT_NO_RETURN(!jprompter != !jdeprecatedPrompter
+                           || !jprompter && !jdeprecatedPrompter);
 
   SVN::Pool requestPool;
   URL url(jurl, requestPool);

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Fri Jul  4 18:07:18 2014
@@ -1063,6 +1063,13 @@ public class SVNRemoteTests extends SVNT
                 return this.relpath.equals(that.relpath);
             }
 
+            @Override
+            public int hashCode()
+            {
+                return this.relpath.hashCode();
+            }
+
+            @Override
             public int compareTo(StatInfo that)
             {
                 return this.relpath.compareTo(that.relpath);

Modified: subversion/branches/remove-log-addressing/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/svn_repos.h?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/svn_repos.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/svn_repos.h Fri Jul  4 18:07:18 2014
@@ -66,20 +66,12 @@ enum svn_node_action
   svn_node_action_replace
 };
 
-/** The different policies for processing the UUID in the dumpfile. */
-enum svn_repos_load_uuid
-{
-  /** only update uuid if the repos has no revisions. */
-  svn_repos_load_uuid_default,
-  /** never update uuid. */
-  svn_repos_load_uuid_ignore,
-  /** always update uuid. */
-  svn_repos_load_uuid_force
-};
-
 
-/** Callback type for checking authorization on paths produced by (at
- * least) svn_repos_dir_delta2().
+/** @defgroup svn_repos_authz_callbacks Repository authorization callbacks
+ * @{
+ */
+
+/** Callback type for checking authorization on a path.
  *
  * Set @a *allowed to TRUE to indicate that some operation is
  * authorized for @a path in @a root, or set it to FALSE to indicate
@@ -167,24 +159,13 @@ typedef svn_error_t *(*svn_repos_authz_c
    void *baton,
    apr_pool_t *pool);
 
-/**
- * Similar to #svn_file_rev_handler_t, but without the @a
- * result_of_merge parameter.
- *
- * @deprecated Provided for backward compatibility with 1.4 API.
- * @since New in 1.1.
+/** @} */
+
+
+/** @defgroup svn_repos_notifications Repository notifications
+ * @{
  */
-typedef svn_error_t *(*svn_repos_file_rev_handler_t)
-  (void *baton,
-   const char *path,
-   svn_revnum_t rev,
-   apr_hash_t *rev_props,
-   svn_txdelta_window_handler_t *delta_handler,
-   void **delta_baton,
-   apr_array_header_t *prop_diffs,
-   apr_pool_t *pool);
 
-
 /* Notification system. */
 
 /** The type of action occurring.
@@ -386,7 +367,9 @@ svn_repos_notify_t *
 svn_repos_notify_create(svn_repos_notify_action_t action,
                         apr_pool_t *result_pool);
 
-
+/** @} */
+
+
 /** The repository object. */
 typedef struct svn_repos_t svn_repos_t;
 
@@ -532,6 +515,11 @@ svn_error_t *
 svn_repos_delete(const char *path,
                  apr_pool_t *pool);
 
+
+/** @defgroup svn_repos_capabilities Repository capabilities
+ * @{
+ */
+
 /**
  * Set @a *has to TRUE if @a repos has @a capability (one of the
  * capabilities beginning with @c "SVN_REPOS_CAPABILITY_"), else set
@@ -568,7 +556,6 @@ svn_repos_capabilities(apr_hash_t **capa
                        svn_repos_t *repos,
                        apr_pool_t *result_pool,
                        apr_pool_t *scratch_pool);
-/** @} */
 
 /**
  * The capability of doing the right thing with merge-tracking
@@ -588,6 +575,31 @@ svn_repos_capabilities(apr_hash_t **capa
  * If you add a capability, update svn_repos_capabilities().
  */
 
+/** @} */
+
+
+/**
+ * Store in @a repos the client-reported capabilities @a capabilities,
+ * which must be allocated in memory at least as long-lived as @a repos.
+ *
+ * The elements of @a capabilities are 'const char *', a subset of
+ * the constants beginning with @c SVN_RA_CAPABILITY_.
+ * @a capabilities is not copied, so changing it later will affect
+ * what is remembered by @a repos.
+ *
+ * @note The capabilities are passed along to the start-commit hook;
+ * see that hook's template for details.
+ *
+ * @note As of Subversion 1.5, there are no error conditions defined,
+ * so this always returns SVN_NO_ERROR.  In future releases it may
+ * return error, however, so callers should check.
+ *
+ * @since New in 1.5.
+ */
+svn_error_t *
+svn_repos_remember_client_capabilities(svn_repos_t *repos,
+                                       const apr_array_header_t *capabilities);
+
 
 /** Return the filesystem associated with repository object @a repos. */
 svn_fs_t *
@@ -1788,16 +1800,6 @@ svn_repos_node_location_segments(svn_rep
                                  apr_pool_t *pool);
 
 
-/* ### other queries we can do someday --
-
-     * fetch the last revision created by <user>
-         (once usernames become revision properties!)
-     * fetch the last revision where <path> was modified
-
-*/
-
-
-
 /* ---------------------------------------------------------------*/
 
 /* Retrieving log messages. */
@@ -2046,6 +2048,23 @@ svn_repos_get_file_revs2(svn_repos_t *re
                          apr_pool_t *pool);
 
 /**
+ * Similar to #svn_file_rev_handler_t, but without the @a
+ * result_of_merge parameter.
+ *
+ * @deprecated Provided for backward compatibility with 1.4 API.
+ * @since New in 1.1.
+ */
+typedef svn_error_t *(*svn_repos_file_rev_handler_t)
+  (void *baton,
+   const char *path,
+   svn_revnum_t rev,
+   apr_hash_t *rev_props,
+   svn_txdelta_window_handler_t *delta_handler,
+   void **delta_baton,
+   apr_array_header_t *prop_diffs,
+   apr_pool_t *pool);
+
+/**
  * Similar to svn_repos_get_file_revs2(), with @a include_merged_revisions
  * set to FALSE.
  *
@@ -2311,6 +2330,12 @@ svn_repos_fs_get_locks(apr_hash_t **lock
 
 /** @} */
 
+/** @defgroup svn_repos_properties Versioned and Unversioned Properties
+ *
+ * Prop-changing and prop-reading wrappers for libsvn_fs routines.
+ * @{
+ */
+
 /**
  * Like svn_fs_change_rev_prop2(), but validate the name and value of the
  * property and invoke the @a repos's pre- and post-revprop-change hooks
@@ -2343,12 +2368,9 @@ svn_repos_fs_change_rev_prop4(svn_repos_
                               const char *name,
                               const svn_string_t *const *old_value_p,
                               const svn_string_t *new_value,
-                              svn_boolean_t
-                              use_pre_revprop_change_hook,
-                              svn_boolean_t
-                              use_post_revprop_change_hook,
-                              svn_repos_authz_func_t
-                              authz_read_func,
+                              svn_boolean_t use_pre_revprop_change_hook,
+                              svn_boolean_t use_post_revprop_change_hook,
+                              svn_repos_authz_func_t authz_read_func,
                               void *authz_read_baton,
                               apr_pool_t *pool);
 
@@ -2367,12 +2389,9 @@ svn_repos_fs_change_rev_prop3(svn_repos_
                               const char *author,
                               const char *name,
                               const svn_string_t *new_value,
-                              svn_boolean_t
-                              use_pre_revprop_change_hook,
-                              svn_boolean_t
-                              use_post_revprop_change_hook,
-                              svn_repos_authz_func_t
-                              authz_read_func,
+                              svn_boolean_t use_pre_revprop_change_hook,
+                              svn_boolean_t use_post_revprop_change_hook,
+                              svn_repos_authz_func_t authz_read_func,
                               void *authz_read_baton,
                               apr_pool_t *pool);
 
@@ -2390,8 +2409,7 @@ svn_repos_fs_change_rev_prop2(svn_repos_
                               const char *author,
                               const char *name,
                               const svn_string_t *new_value,
-                              svn_repos_authz_func_t
-                              authz_read_func,
+                              svn_repos_authz_func_t authz_read_func,
                               void *authz_read_baton,
                               apr_pool_t *pool);
 
@@ -2432,8 +2450,7 @@ svn_repos_fs_revision_prop(svn_string_t 
                            svn_repos_t *repos,
                            svn_revnum_t rev,
                            const char *propname,
-                           svn_repos_authz_func_t
-                           authz_read_func,
+                           svn_repos_authz_func_t authz_read_func,
                            void *authz_read_baton,
                            apr_pool_t *pool);
 
@@ -2458,21 +2475,10 @@ svn_error_t *
 svn_repos_fs_revision_proplist(apr_hash_t **table_p,
                                svn_repos_t *repos,
                                svn_revnum_t rev,
-                               svn_repos_authz_func_t
-                               authz_read_func,
+                               svn_repos_authz_func_t authz_read_func,
                                void *authz_read_baton,
                                apr_pool_t *pool);
 
-
-
-/* ---------------------------------------------------------------*/
-
-/* Prop-changing wrappers for libsvn_fs routines. */
-
-/* NOTE: svn_repos_fs_change_rev_prop() also exists, but is located
-   above with the hook-related functions. */
-
-
 /** Validating wrapper for svn_fs_change_node_prop() (which see for
  * argument descriptions).
  *
@@ -2481,9 +2487,9 @@ svn_repos_fs_revision_proplist(apr_hash_
  * @a value and return SVN_ERR_BAD_PROPERTY_VALUE if it is invalid for the
  * property.
  *
- * @note Currently, the only properties validated are the "svn:" properties
- * #SVN_PROP_REVISION_LOG and #SVN_PROP_REVISION_DATE. This may change
- * in future releases.
+ * @note Originally, the only properties validated were the "svn:" properties
+ * #SVN_PROP_REVISION_LOG and #SVN_PROP_REVISION_DATE. For the current
+ * validation rules see the private function svn_repos__validate_prop().
  */
 svn_error_t *
 svn_repos_fs_change_node_prop(svn_fs_root_t *root,
@@ -2492,6 +2498,36 @@ svn_repos_fs_change_node_prop(svn_fs_roo
                               const svn_string_t *value,
                               apr_pool_t *pool);
 
+/**
+ * Set @a *inherited_values to a depth-first ordered array of
+ * #svn_prop_inherited_item_t * structures (the path_or_url members of
+ * which are relative filesystem paths) representing the properties
+ * inherited by @a path in @a root.  If no properties are inherited,
+ * then set @a *inherited_values to an empty array.
+ *
+ * if @a propname is NULL then retrieve all explicit and/or inherited
+ * properties.  Otherwise retrieve only the properties named @a propname.
+ *
+ * If optional @a authz_read_func is non-NULL, then use this function
+ * (along with optional @a authz_read_baton) to check the readability
+ * of each parent path from which properties are inherited. Silently omit
+ * properties for unreadable parent paths.
+ *
+ * Allocate @a *inherited_props in @a result_pool.  Use @a scratch_pool for
+ * temporary allocations.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_repos_fs_get_inherited_props(apr_array_header_t **inherited_props,
+                                 svn_fs_root_t *root,
+                                 const char *path,
+                                 const char *propname,
+                                 svn_repos_authz_func_t authz_read_func,
+                                 void *authz_read_baton,
+                                 apr_pool_t *result_pool,
+                                 apr_pool_t *scratch_pool);
+
 /** Validating wrapper for svn_fs_change_txn_prop() (which see for
  * argument descriptions).  See svn_repos_fs_change_txn_props() for more
  * information.
@@ -2513,6 +2549,8 @@ svn_repos_fs_change_txn_props(svn_fs_txn
                               const apr_array_header_t *props,
                               apr_pool_t *pool);
 
+/** @} */
+
 
 /* ---------------------------------------------------------------*/
 
@@ -2629,7 +2667,7 @@ svn_repos_info_format(int *repos_format,
 /* ---------------------------------------------------------------*/
 
 /**
- * @defgroup svn_repos_dump_load Dumping and loading filesystem data
+ * @defgroup svn_repos_dump_load Dumping, loading and verifying filesystem data
  * @{
  *
  * The filesystem 'dump' format contains nothing but the abstract
@@ -2693,6 +2731,17 @@ svn_repos_info_format(int *repos_format,
 #define SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM  \
                                         SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5
 
+/** The different policies for processing the UUID in the dumpfile. */
+enum svn_repos_load_uuid
+{
+  /** only update uuid if the repos has no revisions. */
+  svn_repos_load_uuid_default,
+  /** never update uuid. */
+  svn_repos_load_uuid_ignore,
+  /** always update uuid. */
+  svn_repos_load_uuid_force
+};
+
 /**
  * Verify the contents of the file system in @a repos.
  *
@@ -3630,61 +3679,6 @@ svn_repos_check_revision_access(svn_repo
                                 void *authz_read_baton,
                                 apr_pool_t *pool);
 
-/**
- * Set @a *inherited_values to a depth-first ordered array of
- * #svn_prop_inherited_item_t * structures (the path_or_url members of
- * which are relative filesystem paths) representing the properties
- * inherited by @a path in @a root.  If no properties are inherited,
- * then set @a *inherited_values to an empty array.
- *
- * if @a propname is NULL then retrieve all explicit and/or inherited
- * properties.  Otherwise retrieve only the properties named @a propname.
- *
- * If optional @a authz_read_func is non-NULL, then use this function
- * (along with optional @a authz_read_baton) to check the readability
- * of each parent path from which properties are inherited. Silently omit
- * properties for unreadable parent paths.
- *
- * Allocate @a *inherited_props in @a result_pool.  Use @a scratch_pool for
- * temporary allocations.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_repos_fs_get_inherited_props(apr_array_header_t **inherited_props,
-                                 svn_fs_root_t *root,
-                                 const char *path,
-                                 const char *propname,
-                                 svn_repos_authz_func_t authz_read_func,
-                                 void *authz_read_baton,
-                                 apr_pool_t *result_pool,
-                                 apr_pool_t *scratch_pool);
-
-
-/** Capabilities **/
-
-/**
- * Store in @a repos the client-reported capabilities @a capabilities,
- * which must be allocated in memory at least as long-lived as @a repos.
- *
- * The elements of @a capabilities are 'const char *', a subset of
- * the constants beginning with @c SVN_RA_CAPABILITY_.
- * @a capabilities is not copied, so changing it later will affect
- * what is remembered by @a repos.
- *
- * @note The capabilities are passed along to the start-commit hook;
- * see that hook's template for details.
- *
- * @note As of Subversion 1.5, there are no error conditions defined,
- * so this always returns SVN_NO_ERROR.  In future releases it may
- * return error, however, so callers should check.
- *
- * @since New in 1.5.
- */
-svn_error_t *
-svn_repos_remember_client_capabilities(svn_repos_t *repos,
-                                       const apr_array_header_t *capabilities);
-
 
 #ifdef __cplusplus
 }

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c Fri Jul  4 18:07:18 2014
@@ -54,19 +54,8 @@
 
 #include "svn_private_config.h"
 
-/* Import context baton.
+/* Import context baton. */
 
-   ### TODO:  Add the following items to this baton:
-      /` import editor/baton. `/
-      const svn_delta_editor_t *editor;
-      void *edit_baton;
-
-      /` Client context baton `/
-      svn_client_ctx_t `ctx;
-
-      /` Paths (keys) excluded from the import (values ignored) `/
-      apr_hash_t *excludes;
-*/
 typedef struct import_ctx_t
 {
   /* Whether any changes were made to the repository */
@@ -591,6 +580,9 @@ import_dir(const svn_delta_editor_t *edi
 /* Recursively import PATH to a repository using EDITOR and
  * EDIT_BATON.  PATH can be a file or directory.
  *
+ * Sets *UPDATED_REPOSITORY to TRUE when the repository was modified by
+ * a successfull commit, otherwise to FALSE.
+ *
  * DEPTH is the depth at which to import PATH; it behaves as for
  * svn_client_import4().
  *
@@ -640,7 +632,8 @@ import_dir(const svn_delta_editor_t *edi
  * not necessarily the root.)
  */
 static svn_error_t *
-import(const char *local_abspath,
+import(svn_boolean_t *updated_repository,
+       const char *local_abspath,
        const char *url,
        const apr_array_header_t *new_entries,
        const svn_delta_editor_t *editor,
@@ -662,11 +655,13 @@ import(const char *local_abspath,
   void *root_baton;
   apr_array_header_t *batons = NULL;
   const char *edit_path = "";
-  import_ctx_t *import_ctx = apr_pcalloc(pool, sizeof(*import_ctx));
+  import_ctx_t import_ctx = { FALSE };
   const svn_io_dirent2_t *dirent;
 
-  import_ctx->autoprops = autoprops;
-  SVN_ERR(svn_magic__init(&import_ctx->magic_cookie, ctx->config, pool));
+  *updated_repository = FALSE;
+
+  import_ctx.autoprops = autoprops;
+  SVN_ERR(svn_magic__init(&import_ctx.magic_cookie, ctx->config, pool));
 
   /* Get a root dir baton.  We pass the revnum we used for testing our
      assumptions and obtaining inherited properties. */
@@ -701,7 +696,7 @@ import(const char *local_abspath,
                                         pool, &root_baton));
 
           /* Remember that the repository was modified */
-          import_ctx->repos_changed = TRUE;
+          import_ctx.repos_changed = TRUE;
         }
     }
   else if (dirent->kind == svn_node_file)
@@ -732,7 +727,7 @@ import(const char *local_abspath,
 
       if (!ignores_match)
         SVN_ERR(import_file(editor, root_baton, local_abspath, edit_path,
-                            dirent, import_ctx, ctx, pool));
+                            dirent, &import_ctx, ctx, pool));
     }
   else if (dirent->kind == svn_node_dir)
     {
@@ -752,7 +747,7 @@ import(const char *local_abspath,
                               root_baton, depth, excludes, global_ignores,
                               no_ignore, no_autoprops,
                               ignore_unknown_node_types, filter_callback,
-                              filter_baton, import_ctx, ctx, pool));
+                              filter_baton, &import_ctx, ctx, pool));
 
     }
   else if (dirent->kind == svn_node_none
@@ -774,7 +769,7 @@ import(const char *local_abspath,
         }
     }
 
-  if (import_ctx->repos_changed)
+  if (import_ctx.repos_changed)
     {
       if (ctx->notify_func2)
         {
@@ -785,10 +780,12 @@ import(const char *local_abspath,
           ctx->notify_func2(ctx->notify_baton2, notify, pool);
         }
 
-      return svn_error_trace(editor->close_edit(edit_baton, pool));
+      SVN_ERR(editor->close_edit(edit_baton, pool));
+
+      *updated_repository = TRUE;
     }
-  else
-    return svn_error_trace(editor->abort_edit(edit_baton, pool));
+
+  return SVN_NO_ERROR;
 }
 
 
@@ -827,6 +824,7 @@ svn_client_import5(const char *path,
   svn_revnum_t base_rev;
   apr_array_header_t *inherited_props = NULL;
   apr_hash_t *url_props = NULL;
+  svn_boolean_t updated_repository;
 
   if (svn_path_is_url(path))
     return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
@@ -988,21 +986,24 @@ svn_client_import5(const char *path,
         }
     }
 
-  /* If an error occurred during the commit, abort the edit and return
-     the error.  We don't even care if the abort itself fails.  */
-  if ((err = import(local_abspath, url, new_entries, editor, edit_baton,
-                    depth, base_rev, excludes, autoprops, local_ignores_arr,
-                    global_ignores, no_ignore, no_autoprops,
-                    ignore_unknown_node_types, filter_callback,
-                    filter_baton, ctx, iterpool)))
+  /* If an error occurred during the commit, properly abort the edit.  */
+  err = svn_error_trace(import(&updated_repository,
+                               local_abspath, url, new_entries, editor,
+                               edit_baton, depth, base_rev, excludes,
+                               autoprops, local_ignores_arr, global_ignores,
+                               no_ignore, no_autoprops,
+                               ignore_unknown_node_types, filter_callback,
+                               filter_baton, ctx, iterpool));
+
+  svn_pool_destroy(iterpool);
+
+  if (err || !updated_repository)
     {
       return svn_error_compose_create(
                     err,
                     editor->abort_edit(edit_baton, iterpool));
     }
 
-  svn_pool_destroy(iterpool);
-
   return SVN_NO_ERROR;
 }
 

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c Fri Jul  4 18:07:18 2014
@@ -493,11 +493,11 @@ svn_client_revprop_set2(const char *prop
       const svn_string_t *unset = NULL;
 
       if (original_propval == NULL)
-      	old_value_p = NULL;
+        old_value_p = NULL;
       else if (original_propval->data == NULL)
-      	old_value_p = &unset;
+        old_value_p = &unset;
       else
-      	old_value_p = &original_propval;
+        old_value_p = &original_propval;
 
       /* The actual RA call. */
       SVN_ERR(svn_ra_change_rev_prop2(ra_session, *set_rev, propname,

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_delta/xdelta.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_delta/xdelta.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_delta/xdelta.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_delta/xdelta.c Fri Jul  4 18:07:18 2014
@@ -114,7 +114,7 @@ struct block
    (our delta window size much much smaller then 4GB).
    That reduces the hash table size by 50% from 32to 16KB
    and makes it easier to fit into the CPU's L1 cache. */
-  apr_uint32_t pos;			/* NO_POSITION -> block is not used */
+  apr_uint32_t pos;    /* NO_POSITION -> block is not used */
 };
 
 /* A hash table, using open addressing, of the blocks of the source. */

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_diff/binary_diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_diff/binary_diff.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_diff/binary_diff.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_diff/binary_diff.c Fri Jul  4 18:07:18 2014
@@ -119,7 +119,7 @@ write_literal(svn_filesize_t uncompresse
     {
       char chunk[GIT_BASE85_CHUNKSIZE];
       const unsigned char *next;
-      int left;
+      apr_size_t left;
 
       rd = sizeof(chunk);
 

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_diff/diff_file.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_diff/diff_file.c Fri Jul  4 18:07:18 2014
@@ -139,16 +139,16 @@ datasource_to_index(svn_diff_datasource_
  * *LENGTH.  The actual bytes read are stored in *LENGTH on return.
  */
 static APR_INLINE svn_error_t *
-read_chunk(apr_file_t *file, const char *path,
+read_chunk(apr_file_t *file,
            char *buffer, apr_off_t length,
-           apr_off_t offset, apr_pool_t *pool)
+           apr_off_t offset, apr_pool_t *scratch_pool)
 {
   /* XXX: The final offset may not be the one we asked for.
    * XXX: Check.
    */
-  SVN_ERR(svn_io_file_seek(file, APR_SET, &offset, pool));
+  SVN_ERR(svn_io_file_seek(file, APR_SET, &offset, scratch_pool));
   return svn_io_file_read_full2(file, buffer, (apr_size_t) length,
-                                NULL, NULL, pool);
+                                NULL, NULL, scratch_pool);
 }
 
 
@@ -288,7 +288,7 @@ increment_chunk(struct file_info *file, 
       file->chunk++;
       length = file->chunk == last_chunk ?
         offset_in_chunk(file->size) : CHUNK_SIZE;
-      SVN_ERR(read_chunk(file->file, file->path, file->buffer,
+      SVN_ERR(read_chunk(file->file, file->buffer,
                          length, chunk_to_offset(file->chunk),
                          pool));
       file->endp = file->buffer + length;
@@ -315,7 +315,7 @@ decrement_chunk(struct file_info *file, 
     {
       /* Read previous chunk and reset pointers. */
       file->chunk--;
-      SVN_ERR(read_chunk(file->file, file->path, file->buffer,
+      SVN_ERR(read_chunk(file->file, file->buffer,
                          CHUNK_SIZE, chunk_to_offset(file->chunk),
                          pool));
       file->endp = file->buffer + CHUNK_SIZE;
@@ -575,7 +575,7 @@ find_identical_suffix(apr_off_t *suffix_
           /* There is at least more than 1 chunk,
              so allocate full chunk size buffer */
           file_for_suffix[i].buffer = apr_palloc(pool, CHUNK_SIZE);
-          SVN_ERR(read_chunk(file_for_suffix[i].file, file_for_suffix[i].path,
+          SVN_ERR(read_chunk(file_for_suffix[i].file,
                              file_for_suffix[i].buffer, length[i],
                              chunk_to_offset(file_for_suffix[i].chunk),
                              pool));
@@ -649,10 +649,9 @@ find_identical_suffix(apr_off_t *suffix_
 
       /* Scan quickly by reading with machine-word granularity. */
       for (i = 0, can_read_word = TRUE; can_read_word && i < file_len; i++)
-        can_read_word = can_read_word
-                        && (  (file_for_suffix[i].curp + 1
-                                 - sizeof(apr_uintptr_t))
-                            > min_curp[i]);
+        can_read_word = ((file_for_suffix[i].curp + 1 - sizeof(apr_uintptr_t))
+                         > min_curp[i]);
+
       while (can_read_word)
         {
           apr_uintptr_t chunk;
@@ -667,8 +666,7 @@ find_identical_suffix(apr_off_t *suffix_
             break;
 
           for (i = 1, is_match = TRUE; is_match && i < file_len; i++)
-            is_match = is_match
-                       && (   chunk
+            is_match = (chunk
                            == *(const apr_uintptr_t *)
                                     (file_for_suffix[i].curp + 1
                                        - sizeof(apr_uintptr_t)));
@@ -805,7 +803,7 @@ datasources_open(void *baton,
       file->size = finfo[i].size;
       length[i] = finfo[i].size > CHUNK_SIZE ? CHUNK_SIZE : finfo[i].size;
       file->buffer = apr_palloc(file_baton->pool, (apr_size_t) length[i]);
-      SVN_ERR(read_chunk(file->file, file->path, file->buffer,
+      SVN_ERR(read_chunk(file->file, file->buffer,
                          length[i], 0, file_baton->pool));
       file->endp = file->buffer + length[i];
       file->curp = file->buffer;
@@ -973,7 +971,7 @@ datasource_get_next_token(apr_uint32_t *
          When changing things here, make sure the whitespace settings are
          applied, or we might not reach the exact suffix boundary as token
          boundary. */
-      SVN_ERR(read_chunk(file->file, file->path,
+      SVN_ERR(read_chunk(file->file,
                          curp, length,
                          chunk_to_offset(file->chunk),
                          file_baton->pool));
@@ -1115,7 +1113,6 @@ token_compare(void *baton, void *token1,
                 COMPARE_CHUNK_SIZE : raw_length[i];
 
               SVN_ERR(read_chunk(file[i]->file,
-                                 file[i]->path,
                                  bufp[i], length[i], offset[i],
                                  file_baton->pool));
               offset[i] += length[i];

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_diff/lcs.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_diff/lcs.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_diff/lcs.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_diff/lcs.c Fri Jul  4 18:07:18 2014
@@ -345,7 +345,7 @@ svn_diff__lcs(svn_diff__position_t *posi
         {
           svn_diff__snake(fp + k, token_counts, &lcs_freelist, pool);
         }
-	  /* for k > 0, deletions are free */
+      /* for k > 0, deletions are free */
       for (k = (d > 0 ? d : 0) + p; k >= 0; k--)
         {
           svn_diff__snake(fp + k, token_counts, &lcs_freelist, pool);

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/bdb/strings-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/bdb/strings-table.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/bdb/strings-table.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/bdb/strings-table.c Fri Jul  4 18:07:18 2014
@@ -236,9 +236,9 @@ svn_fs_bdb__string_read(svn_fs_t *fs,
     {
       svn_fs_base__clear_dbt(&result);
       result.data = buf + bytes_read;
-      result.ulen = *len - bytes_read;
+      result.ulen = (u_int32_t)(*len - bytes_read);
       result.doff = (u_int32_t)offset;
-      result.dlen = *len - bytes_read;
+      result.dlen = result.ulen;
       result.flags |= (DB_DBT_USERMEM | DB_DBT_PARTIAL);
       db_err = svn_bdb_dbc_get(cursor, &query, &result, DB_CURRENT);
       if (db_err)

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/dag.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/dag.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/dag.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/dag.c Fri Jul  4 18:07:18 2014
@@ -1124,7 +1124,7 @@ svn_fs_fs__dag_serialize(void **data,
 
   /* The deserializer will use its own pool. */
   svn_temp_serializer__set_null(context,
-				(const void * const *)&node->node_pool);
+                                (const void * const *)&node->node_pool);
 
   /* serialize other sub-structures */
   svn_fs_fs__id_serialize(context, (const svn_fs_id_t **)&node->id);

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c Fri Jul  4 18:07:18 2014
@@ -1467,8 +1467,6 @@ svn_fs_fs__create(svn_fs_t *fs,
   SVN_ERR(svn_io_file_create_empty(svn_fs_fs__path_lock(fs, pool), pool));
   SVN_ERR(svn_fs_fs__set_uuid(fs, NULL, pool));
 
-  SVN_ERR(write_revision_zero(fs, pool));
-
   /* Create the fsfs.conf file if supported.  Older server versions would
      simply ignore the file but that might result in a different behavior
      than with the later releases.  Also, hotcopy would ignore, i.e. not
@@ -1481,6 +1479,9 @@ svn_fs_fs__create(svn_fs_t *fs,
   /* Global configuration options. */
   SVN_ERR(read_global_config(fs));
 
+  /* Add revision 0. */
+  SVN_ERR(write_revision_zero(fs, pool));
+
   /* Create the min unpacked rev file. */
   if (ffd->format >= SVN_FS_FS__MIN_PACKED_FORMAT)
     SVN_ERR(svn_io_file_create(svn_fs_fs__path_min_unpacked_rev(fs, pool),

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/rev_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/rev_file.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/rev_file.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/rev_file.c Fri Jul  4 18:07:18 2014
@@ -65,7 +65,7 @@ static apr_status_t
 set_read_only(void *baton)
 {
   set_read_only_baton_t *ro_baton = baton;
-  apr_status_t status;
+  apr_status_t status = APR_SUCCESS;
   svn_error_t *err;
 
   err = svn_io_set_file_read_only(ro_baton->file_path, TRUE, ro_baton->pool);

Propchange: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/libsvn_fs_x:r1603891-1607900

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.c Fri Jul  4 18:07:18 2014
@@ -1120,7 +1120,7 @@ svn_fs_x__dag_serialize(void **data,
 
   /* The deserializer will use its own pool. */
   svn_temp_serializer__set_null(context,
-				(const void * const *)&node->node_pool);
+                                (const void * const *)&node->node_pool);
 
   /* serialize other sub-structures */
   svn_fs_x__id_serialize(context, (const svn_fs_id_t **)&node->id);

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c Fri Jul  4 18:07:18 2014
@@ -652,9 +652,9 @@ proppatch_walker(void *baton,
   if (wb->filter != filter_all_props)
     {
       if (wb->filter == filter_props_with_old_value && ! have_old_val)
-      	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
       if (wb->filter == filter_props_without_old_value && have_old_val)
-      	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
     }
   if (wb->deleting)
     val = NULL;
@@ -2212,6 +2212,10 @@ abort_edit(void *edit_baton,
       return svn_error_trace(svn_ra_serf__unexpected_status(handler));
     }
 
+  /* Don't delete again if somebody aborts twice */
+  ctx->activity_url = NULL;
+  ctx->txn_url = NULL;
+
   return SVN_NO_ERROR;
 }
 

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c Fri Jul  4 18:07:18 2014
@@ -798,9 +798,10 @@ static svn_error_t *ra_svn_open(svn_ra_s
                                 const svn_ra_callbacks2_t *callbacks,
                                 void *callback_baton,
                                 apr_hash_t *config,
-                                apr_pool_t *pool)
+                                apr_pool_t *result_pool,
+                                apr_pool_t *scratch_pool)
 {
-  apr_pool_t *sess_pool = svn_pool_create(pool);
+  apr_pool_t *sess_pool = svn_pool_create(result_pool);
   svn_ra_svn__session_baton_t *sess;
   const char *tunnel, **tunnel_argv;
   apr_uri_t uri;
@@ -812,7 +813,7 @@ static svn_error_t *ra_svn_open(svn_ra_s
 
   SVN_ERR(parse_url(url, &uri, sess_pool));
 
-  parse_tunnel(url, &tunnel, pool);
+  parse_tunnel(url, &tunnel, result_pool);
 
   /* Use the default tunnel implementation if we got a tunnel name,
      but either do not have tunnel handler callbacks installed, or
@@ -823,7 +824,7 @@ static svn_error_t *ra_svn_open(svn_ra_s
               && !callbacks->check_tunnel_func(callbacks->tunnel_baton,
                                                tunnel))))
     SVN_ERR(find_tunnel_agent(tunnel, uri.hostinfo, &tunnel_argv, config,
-                              pool));
+                              result_pool));
   else
     tunnel_argv = NULL;
 
@@ -845,54 +846,30 @@ static svn_error_t *ra_svn_open(svn_ra_s
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *ra_svn_open_pool(svn_ra_session_t *session,
+                                     const char **corrected_url,
+                                     const char *url,
+                                     const svn_ra_callbacks2_t *callbacks,
+                                     void *callback_baton,
+                                     apr_hash_t *config,
+                                     apr_pool_t *pool)
+{
+  return ra_svn_open(session, corrected_url, url, callbacks, callback_baton,
+                     config, pool, pool);
+}
+
 static svn_error_t *ra_svn_dup_session(svn_ra_session_t *new_session,
                                        svn_ra_session_t *old_session,
                                        const char *new_session_url,
                                        apr_pool_t *result_pool,
                                        apr_pool_t *scratch_pool)
 {
-  apr_pool_t *sess_pool = svn_pool_create(result_pool);
   svn_ra_svn__session_baton_t *old_sess = old_session->priv;
-  svn_ra_svn__session_baton_t *new_sess;
-  const char *tunnel, **tunnel_argv;
-  apr_uri_t uri;
-  svn_config_t *cfg, *cfg_client;
-  apr_hash_t *config = old_sess->config;
-  const svn_ra_callbacks2_t *callbacks = old_sess->callbacks;
-  void *callback_baton = old_sess->callbacks_baton;
-
-  SVN_ERR(parse_url(new_session_url, &uri, sess_pool));
 
-  parse_tunnel(new_session_url, &tunnel, result_pool);
-
-  /* Use the default tunnel implementation if we got a tunnel name,
-     but either do not have tunnel handler callbacks installed, or
-     the handlers don't like the tunnel name. */
-  if (tunnel
-      && (!callbacks->open_tunnel_func
-          || (callbacks->check_tunnel_func && callbacks->open_tunnel_func
-              && !callbacks->check_tunnel_func(callbacks->tunnel_baton,
-                                               tunnel))))
-    SVN_ERR(find_tunnel_agent(tunnel, uri.hostinfo, &tunnel_argv,
-                              config,
-                              result_pool));
-  else
-    tunnel_argv = NULL;
-
-  cfg_client = config
-               ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG)
-               : NULL;
-  cfg = config ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_SERVERS) : NULL;
-  svn_auth_set_parameter(callbacks->auth_baton,
-                         SVN_AUTH_PARAM_CONFIG_CATEGORY_CONFIG, cfg_client);
-  svn_auth_set_parameter(callbacks->auth_baton,
-                         SVN_AUTH_PARAM_CONFIG_CATEGORY_SERVERS, cfg);
-
-  /* We open the session in a subpool so we can get rid of it if we
-     reparent with a server that doesn't support reparenting. */
-  SVN_ERR(open_session(&new_sess, new_session_url, &uri, tunnel, tunnel_argv,
-                       config, callbacks, callback_baton, sess_pool));
-  new_session->priv = new_sess;
+  SVN_ERR(ra_svn_open(new_session, NULL, new_session_url,
+                      old_sess->callbacks, old_sess->callbacks_baton,
+                      old_sess->config,
+                      result_pool, scratch_pool));
 
   return SVN_NO_ERROR;
 }
@@ -2885,7 +2862,7 @@ static const svn_ra__vtable_t ra_svn_vta
   svn_ra_svn_version,
   ra_svn_get_description,
   ra_svn_get_schemes,
-  ra_svn_open,
+  ra_svn_open_pool,
   ra_svn_dup_session,
   ra_svn_reparent,
   ra_svn_get_session_url,

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c Fri Jul  4 18:07:18 2014
@@ -2823,7 +2823,7 @@ svn_membuffer_get_segment_info(svn_membu
                                svn_cache__info_t *info,
                                svn_boolean_t include_histogram)
 {
-  apr_size_t i;
+  apr_uint32_t i;
 
   info->data_size += segment->l1.size + segment->l2.size;
   info->used_size += segment->data_used;

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf_width.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf_width.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf_width.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf_width.c Fri Jul  4 18:07:18 2014
@@ -190,7 +190,7 @@ mk_wcwidth(apr_uint32_t ucs)
 
   /* binary search in table of non-spacing characters */
   if (bisearch(ucs, combining,
-	       sizeof(combining) / sizeof(struct interval) - 1))
+               sizeof(combining) / sizeof(struct interval) - 1))
     return 0;
 
   /* if we arrive here, ucs is not a combining or C0/C1 control character */

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_wc/questions.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_wc/questions.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_wc/questions.c Fri Jul  4 18:07:18 2014
@@ -159,8 +159,8 @@ compare_and_verify(svn_boolean_t *modifi
     }
   else
     {
-	  /* We don't use APR-level buffering because the comparison function
-	   * will do its own buffering. */
+      /* We don't use APR-level buffering because the comparison function
+       * will do its own buffering. */
       apr_file_t *file;
       SVN_ERR(svn_io_file_open(&file, versioned_file_abspath, APR_READ,
                                APR_OS_DEFAULT, scratch_pool));

Modified: subversion/branches/remove-log-addressing/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/svn/copy-cmd.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/svn/copy-cmd.c (original)
+++ subversion/branches/remove-log-addressing/subversion/svn/copy-cmd.c Fri Jul  4 18:07:18 2014
@@ -150,8 +150,7 @@ svn_cl__copy(apr_getopt_t *os,
     }
   else
     {
-      /* URL -> URL, meaning that no notification is needed. */
-      ctx->notify_func2 = NULL;
+      /* URL -> URL */
     }
 
   if (! dst_is_url)

Modified: subversion/branches/remove-log-addressing/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/svn/merge-cmd.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/svn/merge-cmd.c (original)
+++ subversion/branches/remove-log-addressing/subversion/svn/merge-cmd.c Fri Jul  4 18:07:18 2014
@@ -37,10 +37,6 @@
 
 #include "svn_private_config.h"
 
-/* A handy constant */
-static const svn_opt_revision_t unspecified_revision
-  = { svn_opt_revision_unspecified, { 0 } };
-
 
 /*** Code. ***/
 

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/atomic-ra-revprop-change.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/atomic-ra-revprop-change.c?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/atomic-ra-revprop-change.c (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/atomic-ra-revprop-change.c Fri Jul  4 18:07:18 2014
@@ -118,13 +118,13 @@ change_rev_prop(const char *url,
         }
       else if (! want_error && ! err)
         /* Expectation was matched.  Get out. */
-      	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
       else if (want_error && ! err)
         return svn_error_create(SVN_ERR_TEST_FAILED, NULL,
                                 "An error was expected but not seen");
       else
-      	/* A real (non-SVN_ERR_FS_PROP_BASEVALUE_MISMATCH) error. */
-      	return svn_error_trace(err);
+        /* A real (non-SVN_ERR_FS_PROP_BASEVALUE_MISMATCH) error. */
+        return svn_error_trace(err);
     }
   else
     /* Running under --server-minor-version? */

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/basic_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/basic_tests.py Fri Jul  4 18:07:18 2014
@@ -280,7 +280,7 @@ def basic_mkdir_url_with_parents(sbox):
   U_V_url = sbox.repo_url + '/U/V'
   U_V_W_url = sbox.repo_url + '/U/V/W'
   svntest.actions.run_and_verify_svn("erroneous mkdir sans --parents",
-                                     [],
+                                     None,
                                      ".*Try 'svn mkdir --parents' instead.*",
                                      'mkdir', '-m', 'log_msg',
                                      X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py Fri Jul  4 18:07:18 2014
@@ -656,7 +656,8 @@ def blame_output_after_merge(sbox):
 
   # r4: create branches/br from trunk
   branches_br_url = sbox.repo_url + "/branches/br"
-  svntest.actions.run_and_verify_svn(None, ["Committed revision 4.\n"], [],
+  svntest.actions.run_and_verify_svn(None, ["Committing transaction...\n",
+                                            "Committed revision 4.\n"], [],
                                     'cp', '--parents',
                                      trunk_url, branches_br_url,
                                      "-m", "create branch")

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py Fri Jul  4 18:07:18 2014
@@ -1095,7 +1095,8 @@ def url_copy_parent_into_child(sbox):
 
   # Issue 1367 parent/child URL-to-URL was rejected.
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 2.\n'], [],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 2.\n'], [],
                                      'cp',
                                      '-m', 'a can of worms',
                                      B_url, F_url)

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tests.py Fri Jul  4 18:07:18 2014
@@ -686,7 +686,8 @@ def simple_property_merges(sbox):
   A_url = sbox.repo_url + '/A'
   A2_url = sbox.repo_url + '/A2'
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 5.\n'], [],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 5.\n'], [],
                                      'copy', '-m', 'copy A to A2',
                                      A_url, A2_url)
 
@@ -8137,7 +8138,8 @@ def merge_old_and_new_revs_from_renamed_
   mu_MOVED_path = sbox.ospath('A/mu_MOVED')
 
   # Copy mu to mu_COPY
-  svntest.actions.run_and_verify_svn(None, ['Committed revision 2.\n'],
+  svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+                                            'Committed revision 2.\n'],
                                      [], 'cp', '-m', 'cp mu to mu_COPY',
                                      mu_url, mu_COPY_url)
 
@@ -8229,7 +8231,8 @@ def merge_with_auto_rev_range_detection(
                                         expected_status, None, wc_dir)
 
   # Copy A to A_COPY
-  svntest.actions.run_and_verify_svn(None, ['Committed revision 3.\n'],
+  svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+                                            'Committed revision 3.\n'],
                                      [], 'cp', '-m', 'cp A to A_COPY',
                                      A_url, A_COPY_url)
 
@@ -10551,9 +10554,11 @@ def merge_added_subtree(sbox):
   A_COPY_url = url + "/A_COPY"
   A_path = sbox.ospath('A')
 
-  svntest.actions.run_and_verify_svn("",["Committed revision 2.\n"], [],
+  svntest.actions.run_and_verify_svn("",["Committing transaction...\n",
+                                         "Committed revision 2.\n"], [],
                                      "cp", "-m", "", A_url, A_COPY_url)
-  svntest.actions.run_and_verify_svn("",["Committed revision 3.\n"], [],
+  svntest.actions.run_and_verify_svn("",["Committing transaction...\n",
+                                         "Committed revision 3.\n"], [],
                                      "cp", "-m", "",
                                      A_COPY_url + '/D',
                                      A_COPY_url + '/D2')
@@ -10812,7 +10817,8 @@ def dont_merge_revs_into_subtree_that_pr
 
   # Copy 'A/D/H' to 'H_COPY' in r6.
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 6.\n'],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 6.\n'],
                                      [], 'copy',
                                      sbox.repo_url + "/A/D/H",
                                      sbox.repo_url + "/H_COPY",
@@ -10964,7 +10970,8 @@ def set_up_renamed_subtree(sbox):
 
   # Copy 'A/D/H' to 'H_COPY' in r5.
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 5.\n'],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 5.\n'],
                                      [], 'copy',
                                      sbox.repo_url + "/A/D/H",
                                      sbox.repo_url + "/H_COPY",
@@ -14035,13 +14042,15 @@ def set_up_natural_history_gap(sbox):
 
   # r7: Resurrect 'A' by copying 'A@2' to 'A'.
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-    None, ["Committed revision 7.\n"], [],
+    None, ["Committing transaction...\n",
+           "Committed revision 7.\n"], [],
     'copy', sbox.repo_url + '/A@2', sbox.repo_url + '/A',
     '-m', 'Resurrect A from A@2')
 
   # r8: Branch the resurrected 'A' to 'A_COPY'.
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-    None, ["Committed revision 8.\n"], [],
+    None, ["Committing transaction...\n",
+           "Committed revision 8.\n"], [],
     'copy', sbox.repo_url + '/A', sbox.repo_url + '/A_COPY',
     '-m', 'Copy A to A_COPY')
 

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Jul  4 18:07:18 2014
@@ -1456,9 +1456,10 @@ def merge_replace_setup(sbox):
 
   # make a branch of A
   # svn cp $URL/A $URL/branch
-  expected_stdout = verify.UnorderedOutput([
+  expected_stdout = [
+    'Committing transaction...\n',
     'Committed revision 2.\n',
-  ])
+  ]
 
   actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', url_A,
     url_branch, '-m', 'copy log')

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py Fri Jul  4 18:07:18 2014
@@ -2124,6 +2124,8 @@ def verify_invalid_path_changes(sbox):
                                            ".*r18: E160013:.*"])
   if (svntest.main.fs_has_rep_sharing()):
     exp_out.insert(0, ".*Verifying.*metadata.*")
+    if svntest.main.is_fs_log_addressing():
+      exp_out.insert(1, ".*Verifying.*metadata.*")
 
   exp_err = svntest.verify.RegexListOutput(["svnadmin: E160020:.*",
                                             "svnadmin: E145001:.*",
@@ -2145,6 +2147,8 @@ def verify_invalid_path_changes(sbox):
 
   if (svntest.main.fs_has_rep_sharing()):
     exp_out.insert(0, ".*Verifying.*metadata.*")
+    if svntest.main.is_fs_log_addressing():
+      exp_out.insert(1, ".*Verifying.*metadata.*")
   if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
                                    output, errput, exp_out, exp_err):
     raise svntest.Failure

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/main.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/main.py Fri Jul  4 18:07:18 2014
@@ -171,6 +171,14 @@ svnauthz_validate_binary = os.path.abspa
     '../../../tools/server-side/svnauthz-validate' + _exe
 )
 
+######################################################################
+# The location of svnfsfs binary, relative to the only scripts that
+# import this file right now (they live in ../).
+# Use --tools to overide these defaults.
+svnfsfs_binary = os.path.abspath(
+    '../../../tools/server-side/svnfsfs/svnfsfs' + _exe
+)
+
 # Location to the pristine repository, will be calculated from test_area_url
 # when we know what the user specified for --url.
 pristine_greek_repos_url = None
@@ -759,6 +767,11 @@ def run_svnauthz_validate(*varargs):
   stderr as list of lines (including line terminators)."""
   return run_command(svnauthz_validate_binary, 1, False, *varargs)
 
+def run_svnfsfs(*varargs):
+  """Run svnfsfs with VARARGS, returns exit code as int; stdout, stderr
+  as list of lines (including line terminators)."""
+  return run_command(svnfsfs_binary, 1, False, *varargs)
+
 def run_lock_helper(repo, path, user, seconds):
   """Run lock-helper to lock path in repo by username for seconds"""
 

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py?rev=1607901&r1=1607900&r2=1607901&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/switch_tests.py Fri Jul  4 18:07:18 2014
@@ -352,7 +352,8 @@ def delete_subdir(sbox):
   A2_B_F_url = sbox.repo_url + '/A2/B/F'
 
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 2.\n'], [],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 2.\n'], [],
                                      'cp', '-m', 'make copy', A_url, A2_url)
 
   svntest.actions.run_and_verify_svn(None,
@@ -645,9 +646,10 @@ def obstructed_switch(sbox):
   url_A_B_Esave = url + '/A/B/Esave'
 
   # svn cp -m msgcopy url/A/B/E url/A/B/Esave
-  expected_stdout = verify.UnorderedOutput([
+  expected_stdout = [
+    'Committing transaction...\n',
     'Committed revision 2.\n',
-  ])
+  ]
 
   actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', '-m',
     'msgcopy', url_A_B_E, url_A_B_Esave)
@@ -785,7 +787,8 @@ def refresh_read_only_attribute(sbox):
   url = sbox.repo_url + '/A'
   branch_url = sbox.repo_url + '/A-branch'
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 2.\n'], [],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 2.\n'], [],
                                      'cp', '-m', 'svn:needs-lock not set',
                                      url, branch_url)
 
@@ -2041,7 +2044,8 @@ def tolerate_local_mods(sbox):
   A2_url = sbox.repo_url + '/A2'
 
   svntest.actions.run_and_verify_svn(None,
-                                     ['Committed revision 2.\n'], [],
+                                     ['Committing transaction...\n',
+                                      'Committed revision 2.\n'], [],
                                      'cp', '-m', 'make copy', A_url, A2_url)
 
   os.mkdir(L_path)



Mime
View raw message