subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1509270 [3/4] - in /subversion/branches/fsfs-improvements: ./ subversion/ subversion/bindings/cxxhl/include/svncxxhl/ subversion/bindings/cxxhl/src/ subversion/bindings/cxxhl/src/aprwrap/ subversion/bindings/cxxhl/src/private/ subversion/b...
Date Thu, 01 Aug 2013 14:55:37 GMT
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/xml.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/xml.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,7 @@
 #include <apr_uri.h>
 #include <serf.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_ra.h"
@@ -36,7 +37,6 @@
 #include "svn_delta.h"
 #include "svn_path.h"
 
-#include "svn_private_config.h"
 #include "private/svn_string_private.h"
 
 #include "ra_serf.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/client.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/client.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,7 @@
 #include <apr_network_io.h>
 #include <apr_uri.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_string.h"
@@ -47,8 +48,6 @@
 #include "svn_mergeinfo.h"
 #include "svn_version.h"
 
-#include "svn_private_config.h"
-
 #include "private/svn_fspath.h"
 #include "private/svn_subr_private.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/editorp.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/editorp.c Thu Aug  1 14:55:32 2013
@@ -28,6 +28,7 @@
 #include <apr_general.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_string.h"
@@ -37,7 +38,6 @@
 #include "svn_ra_svn.h"
 #include "svn_path.h"
 #include "svn_pools.h"
-#include "svn_private_config.h"
 
 #include "private/svn_fspath.h"
 #include "private/svn_editor.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/marshal.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/marshal.c Thu Aug  1 14:55:32 2013
@@ -32,13 +32,13 @@
 #include <apr_lib.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_error.h"
 #include "svn_pools.h"
 #include "svn_ra_svn.h"
-#include "svn_private_config.h"
 #include "svn_ctype.h"
 #include "svn_time.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/authz.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/authz.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,7 @@
 #include <apr_pools.h>
 #include <apr_file_io.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/commit.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/commit.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,7 @@
 #include <apr_pools.h>
 #include <apr_file_io.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_compat.h"
 #include "svn_pools.h"
@@ -39,7 +40,6 @@
 #include "svn_ctype.h"
 #include "svn_props.h"
 #include "svn_mergeinfo.h"
-#include "svn_private_config.h"
 
 #include "repos.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/delta.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/delta.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/delta.c Thu Aug  1 14:55:32 2013
@@ -24,6 +24,7 @@
 
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_delta.h"
@@ -33,7 +34,6 @@
 #include "svn_repos.h"
 #include "svn_pools.h"
 #include "svn_props.h"
-#include "svn_private_config.h"
 #include "repos.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/deprecated.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/deprecated.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/deprecated.c Thu Aug  1 14:55:32 2013
@@ -26,13 +26,12 @@
    deprecated functions in this file. */
 #define SVN_DEPRECATED
 
+#include "svn_private_config.h"
 #include "svn_repos.h"
 #include "svn_compat.h"
 #include "svn_hash.h"
 #include "svn_props.h"
 
-#include "svn_private_config.h"
-
 #include "repos.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/fs-wrap.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/fs-wrap.c Thu Aug  1 14:55:32 2013
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_error.h"
@@ -34,7 +35,7 @@
 #include "svn_time.h"
 #include "svn_sorts.h"
 #include "repos.h"
-#include "svn_private_config.h"
+
 #include "private/svn_repos_private.h"
 #include "private/svn_utf_private.h"
 #include "private/svn_fspath.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/hooks.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/hooks.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/hooks.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/hooks.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 #include <apr_pools.h>
 #include <apr_file_io.h>
 
+#include "svn_private_config.h"
 #include "svn_config.h"
 #include "svn_hash.h"
 #include "svn_error.h"
@@ -36,7 +37,7 @@
 #include "svn_repos.h"
 #include "svn_utf.h"
 #include "repos.h"
-#include "svn_private_config.h"
+
 #include "private/svn_fs_private.h"
 #include "private/svn_repos_private.h"
 #include "private/svn_string_private.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/log.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/log.c Thu Aug  1 14:55:32 2013
@@ -25,8 +25,8 @@
 #define APR_WANT_STRFUNC
 #include <apr_want.h>
 
-#include "svn_compat.h"
 #include "svn_private_config.h"
+#include "svn_compat.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/replay.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/replay.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/replay.c Thu Aug  1 14:55:32 2013
@@ -25,6 +25,7 @@
 
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_delta.h"
 #include "svn_hash.h"
@@ -35,7 +36,7 @@
 #include "svn_props.h"
 #include "svn_pools.h"
 #include "svn_path.h"
-#include "svn_private_config.h"
+
 #include "private/svn_fspath.h"
 #include "private/svn_repos_private.h"
 #include "private/svn_delta_private.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/reporter.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/reporter.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/reporter.c Thu Aug  1 14:55:32 2013
@@ -21,6 +21,7 @@
  * ====================================================================
  */
 
+#include "svn_private_config.h"
 #include "svn_dirent_uri.h"
 #include "svn_hash.h"
 #include "svn_path.h"
@@ -32,7 +33,6 @@
 #include "svn_pools.h"
 #include "svn_props.h"
 #include "repos.h"
-#include "svn_private_config.h"
 
 #include "private/svn_dep_compat.h"
 #include "private/svn_fspath.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos.c Thu Aug  1 14:55:32 2013
@@ -23,6 +23,7 @@
 #include <apr_pools.h>
 #include <apr_file_io.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_error.h"
 #include "svn_dirent_uri.h"
@@ -38,7 +39,6 @@
 
 #include "private/svn_repos_private.h"
 #include "private/svn_subr_private.h"
-#include "svn_private_config.h" /* for SVN_TEMPLATE_ROOT_DIR */
 
 #include "repos.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_repos/rev_hunt.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_repos/rev_hunt.c Thu Aug  1 14:55:32 2013
@@ -23,8 +23,9 @@
 
 
 #include <string.h>
-#include "svn_compat.h"
+
 #include "svn_private_config.h"
+#include "svn_compat.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/auth.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/auth.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/auth.c Thu Aug  1 14:55:32 2013
@@ -26,13 +26,13 @@
 #include <apr_tables.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_error.h"
 #include "svn_auth.h"
 #include "svn_config.h"
-#include "svn_private_config.h"
 #include "svn_dso.h"
 #include "svn_version.h"
 #include "private/svn_dep_compat.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/cmdline.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/cmdline.c Thu Aug  1 14:55:32 2013
@@ -42,6 +42,7 @@
 #include <apr_strings.h>        /* for apr_snprintf */
 #include <apr_pools.h>
 
+#include "svn_private_config.h"
 #include "svn_cmdline.h"
 #include "svn_ctype.h"
 #include "svn_dso.h"
@@ -64,8 +65,6 @@
 #include "private/svn_utf_private.h"
 #include "private/svn_string_private.h"
 
-#include "svn_private_config.h"
-
 #include "win32_crashrpt.h"
 
 /* The stdin encoding. If null, it's the same as the native encoding. */

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/compat.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/compat.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/compat.c Thu Aug  1 14:55:32 2013
@@ -24,6 +24,7 @@
 #include <apr_pools.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/config.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/config.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/config.c Thu Aug  1 14:55:32 2013
@@ -29,12 +29,13 @@
 
 #include <apr_general.h>
 #include <apr_lib.h>
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_error.h"
 #include "svn_pools.h"
 #include "config_impl.h"
 
-#include "svn_private_config.h"
 #include "private/svn_dep_compat.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/config_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/config_auth.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/config_auth.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/config_auth.c Thu Aug  1 14:55:32 2013
@@ -23,6 +23,7 @@
 
 
 
+#include "svn_private_config.h"
 #include "svn_dirent_uri.h"
 #include "svn_hash.h"
 #include "svn_io.h"
@@ -31,14 +32,8 @@
 
 #include "auth.h"
 
-#include "svn_private_config.h"
-
 #include "private/svn_auth_private.h"
 
-/* Helper for svn_config_{read|write}_auth_data.  Return a path to a
-   file within ~/.subversion/auth/ that holds CRED_KIND credentials
-   within REALMSTRING.  If no path is available *PATH will be set to
-   NULL. */
 svn_error_t *
 svn_auth__file_path(const char **path,
                     const char *cred_kind,
@@ -173,12 +168,6 @@ svn_config_walk_auth_data(const char *co
       NULL
     };
 
-  if (! config_dir)
-    {
-      /* Can't locate the cache to clear */
-      return SVN_NO_ERROR;
-    }
-
   iterpool = svn_pool_create(scratch_pool);
   for (i = 0; cred_kinds[i]; i++)
     {

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/deprecated.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/deprecated.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,7 @@
    deprecated functions in this file. */
 #define SVN_DEPRECATED
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_subst.h"
 #include "svn_path.h"
@@ -48,9 +49,6 @@
 #include "private/svn_opt_private.h"
 #include "private/svn_mergeinfo_private.h"
 
-#include "svn_private_config.h"
-
-
 
 
 /*** Code. ***/

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/dso.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/dso.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/dso.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/dso.c Thu Aug  1 14:55:32 2013
@@ -22,10 +22,10 @@
 #include <apr_thread_mutex.h>
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_dso.h"
 #include "svn_pools.h"
-#include "svn_private_config.h"
 
 #include "private/svn_mutex.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/hash.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/hash.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/hash.c Thu Aug  1 14:55:32 2013
@@ -31,6 +31,7 @@
 #include <apr_hash.h>
 #include <apr_file_io.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_error.h"
@@ -42,8 +43,6 @@
 #include "private/svn_dep_compat.h"
 #include "private/svn_subr_private.h"
 
-#include "svn_private_config.h"
-
 
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/io.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/io.c Thu Aug  1 14:55:32 2013
@@ -55,6 +55,7 @@
 #include <fcntl.h>
 #endif
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_dirent_uri.h"
@@ -65,7 +66,6 @@
 #include "svn_pools.h"
 #include "svn_utf.h"
 #include "svn_config.h"
-#include "svn_private_config.h"
 #include "svn_ctype.h"
 
 #include "private/svn_atomic.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/mergeinfo.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/mergeinfo.c Thu Aug  1 14:55:32 2013
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <ctype.h>
 
+#include "svn_private_config.h"
 #include "svn_path.h"
 #include "svn_types.h"
 #include "svn_ctype.h"
@@ -36,7 +37,6 @@
 #include "private/svn_mergeinfo_private.h"
 #include "private/svn_string_private.h"
 #include "private/svn_subr_private.h"
-#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "private/svn_dep_compat.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/opt.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/opt.c Thu Aug  1 14:55:32 2013
@@ -34,6 +34,7 @@
 #include <apr_lib.h>
 #include <apr_file_info.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_version.h"
@@ -50,7 +51,6 @@
 #include "private/svn_opt_private.h"
 
 #include "opt.h"
-#include "svn_private_config.h"
 
 
 /*** Code. ***/

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/properties.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/properties.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/properties.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/properties.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,8 @@
 #include <apr_hash.h>
 #include <apr_tables.h>
 #include <string.h>       /* for strncmp() */
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_string.h"
 #include "svn_props.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/simple_providers.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/simple_providers.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/simple_providers.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/simple_providers.c Thu Aug  1 14:55:32 2013
@@ -28,6 +28,8 @@
 /*** Includes. ***/
 
 #include <apr_pools.h>
+
+#include "svn_private_config.h"
 #include "svn_auth.h"
 #include "svn_dirent_uri.h"
 #include "svn_hash.h"
@@ -39,8 +41,6 @@
 
 #include "private/svn_auth_private.h"
 
-#include "svn_private_config.h"
-
 #include "auth.h"
 
 /*-----------------------------------------------------------------------*/

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/sorts.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/sorts.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/sorts.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/sorts.c Thu Aug  1 14:55:32 2013
@@ -28,6 +28,8 @@
 #include <apr_tables.h>
 #include <stdlib.h>       /* for qsort()   */
 #include <assert.h>
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_path.h"
 #include "svn_sorts.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/spillbuf.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/spillbuf.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/spillbuf.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/spillbuf.c Thu Aug  1 14:55:32 2013
@@ -73,6 +73,20 @@ struct svn_spillbuf_t {
 
   /* How much content remains in SPILL.  */
   svn_filesize_t spill_size;
+
+  /* When false, do not delete the spill file when it is closed. */
+  svn_boolean_t delete_on_close;
+
+  /* When true, the spill file will contain all the data written to
+     the spillbuf, including those that would normally be held only in
+     memory. */
+  svn_boolean_t spill_all_contents;
+
+  /* The directory in which the spill file is created. */
+  const char *dirpath;
+
+  /* The name of the temporary spill file. */
+  const char *temp_path;
 };
 
 
@@ -99,28 +113,86 @@ struct svn_spillbuf_reader_t {
 };
 
 
+/* Extended spillbuf initialization. */
+static void
+init_spillbuf_extended(svn_spillbuf_t *buf,
+                       apr_size_t blocksize,
+                       apr_size_t maxsize,
+                       svn_boolean_t delete_on_close,
+                       svn_boolean_t spill_all_contents,
+                       const char *dirpath,
+                       apr_pool_t *result_pool)
+{
+  buf->pool = result_pool;
+  buf->blocksize = blocksize;
+  buf->maxsize = maxsize;
+  buf->delete_on_close = delete_on_close;
+  buf->spill_all_contents = spill_all_contents;
+  buf->dirpath = dirpath;
+}
+
+/* Common constructor for initializing spillbufs.
+   Used by svn_spillbuf__create, svn_spilbuff__reader_create. */
+static void
+init_spillbuf(svn_spillbuf_t *buf,
+              apr_size_t blocksize,
+              apr_size_t maxsize,
+              apr_pool_t *result_pool)
+{
+  init_spillbuf_extended(buf, blocksize, maxsize,
+                         TRUE, FALSE, NULL,
+                         result_pool);
+}
+
 svn_spillbuf_t *
 svn_spillbuf__create(apr_size_t blocksize,
                      apr_size_t maxsize,
                      apr_pool_t *result_pool)
 {
   svn_spillbuf_t *buf = apr_pcalloc(result_pool, sizeof(*buf));
+  init_spillbuf(buf, blocksize, maxsize, result_pool);
+  return buf;
+}
 
-  buf->pool = result_pool;
-  buf->blocksize = blocksize;
-  buf->maxsize = maxsize;
-  /* Note: changes here should also go into svn_spillbuf__reader_create() */
 
+svn_spillbuf_t *
+svn_spillbuf__create_extended(apr_size_t blocksize,
+                              apr_size_t maxsize,
+                              svn_boolean_t delete_on_close,
+                              svn_boolean_t spill_all_contents,
+                              const char *dirpath,
+                              apr_pool_t *result_pool)
+{
+  svn_spillbuf_t *buf = apr_pcalloc(result_pool, sizeof(*buf));
+  init_spillbuf_extended(buf, blocksize, maxsize,
+                         delete_on_close, spill_all_contents, dirpath,
+                         result_pool);
   return buf;
 }
 
-
 svn_filesize_t
 svn_spillbuf__get_size(const svn_spillbuf_t *buf)
 {
   return buf->memory_size + buf->spill_size;
 }
 
+svn_filesize_t
+svn_spillbuf__get_memory_size(const svn_spillbuf_t *buf)
+{
+  return buf->memory_size;
+}
+
+const char *
+svn_spillbuf__get_filename(const svn_spillbuf_t *buf)
+{
+  return buf->temp_path;
+}
+
+apr_file_t *
+svn_spillbuf__get_file(const svn_spillbuf_t *buf)
+{
+  return buf->spill;
+}
 
 /* Get a memblock from the spill-buffer. It will be the block that we
    passed out for reading, come from the free list, or allocated.  */
@@ -173,10 +245,25 @@ svn_spillbuf__write(svn_spillbuf_t *buf,
       && (buf->memory_size + len) > buf->maxsize)
     {
       SVN_ERR(svn_io_open_unique_file3(&buf->spill,
-                                       NULL /* temp_path */,
-                                       NULL /* dirpath */,
-                                       svn_io_file_del_on_close,
+                                       &buf->temp_path,
+                                       buf->dirpath,
+                                       (buf->delete_on_close
+                                        ? svn_io_file_del_on_close
+                                        : svn_io_file_del_none),
                                        buf->pool, scratch_pool));
+
+      /* Optionally write the memory contents into the file. */
+      if (buf->spill_all_contents && buf->head != NULL)
+        {
+          mem = buf->head;
+          while (mem != NULL)
+            {
+              SVN_ERR(svn_io_file_write_full(buf->spill, mem->data, mem->size,
+                                             NULL, scratch_pool));
+              mem = mem->next;
+            }
+          buf->spill_start = buf->memory_size;
+        }
     }
 
   /* Once a spill file has been constructed, then we need to put all
@@ -440,12 +527,22 @@ svn_spillbuf__reader_create(apr_size_t b
                             apr_pool_t *result_pool)
 {
   svn_spillbuf_reader_t *sbr = apr_pcalloc(result_pool, sizeof(*sbr));
+  init_spillbuf(&sbr->buf, blocksize, maxsize, result_pool);
+  return sbr;
+}
 
-  /* See svn_spillbuf__create()  */
-  sbr->buf.pool = result_pool;
-  sbr->buf.blocksize = blocksize;
-  sbr->buf.maxsize = maxsize;
-
+svn_spillbuf_reader_t *
+svn_spillbuf__reader_create_extended(apr_size_t blocksize,
+                                     apr_size_t maxsize,
+                                     svn_boolean_t delete_on_close,
+                                     svn_boolean_t spill_all_contents,
+                                     const char *dirpath,
+                                     apr_pool_t *result_pool)
+{
+  svn_spillbuf_reader_t *sbr = apr_pcalloc(result_pool, sizeof(*sbr));
+  init_spillbuf_extended(&sbr->buf, blocksize, maxsize,
+                         delete_on_close, spill_all_contents, dirpath,
+                         result_pool);
   return sbr;
 }
 
@@ -595,15 +692,14 @@ write_handler_spillbuf(void *baton, cons
 }
 
 
-svn_stream_t *
-svn_stream__from_spillbuf(apr_size_t blocksize,
-                          apr_size_t maxsize,
-                          apr_pool_t *result_pool)
+/* Wrap a spillbuf reader into a stream. */
+static svn_stream_t *
+stream_from_reader(svn_spillbuf_reader_t *reader, apr_pool_t *result_pool)
 {
   svn_stream_t *stream;
   struct spillbuf_baton *sb = apr_palloc(result_pool, sizeof(*sb));
 
-  sb->reader = svn_spillbuf__reader_create(blocksize, maxsize, result_pool);
+  sb->reader = reader;
   sb->scratch_pool = svn_pool_create(result_pool);
 
   stream = svn_stream_create(sb, result_pool);
@@ -613,3 +709,28 @@ svn_stream__from_spillbuf(apr_size_t blo
 
   return stream;
 }
+
+svn_stream_t *
+svn_stream__from_spillbuf(apr_size_t blocksize,
+                          apr_size_t maxsize,
+                          apr_pool_t *result_pool)
+{
+  return stream_from_reader(
+      svn_spillbuf__reader_create(blocksize, maxsize, result_pool),
+      result_pool);
+}
+
+svn_stream_t *
+svn_stream__from_spillbuf_extended(apr_size_t blocksize,
+                                   apr_size_t maxsize,
+                                   svn_boolean_t delete_on_close,
+                                   svn_boolean_t spill_all_contents,
+                                   const char *dirpath,
+                                   apr_pool_t *result_pool)
+{
+  return stream_from_reader(
+      svn_spillbuf__reader_create_extended(
+          blocksize, maxsize, delete_on_close,
+          spill_all_contents, dirpath, result_pool),
+      result_pool);
+}

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_providers.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_providers.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_providers.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_providers.c Thu Aug  1 14:55:32 2013
@@ -29,6 +29,8 @@
 /*** Includes. ***/
 
 #include <apr_pools.h>
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_auth.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_pw_providers.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_pw_providers.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_client_cert_pw_providers.c Thu Aug  1 14:55:32 2013
@@ -25,6 +25,7 @@
 
 #include <apr_pools.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_auth.h"
 #include "svn_error.h"
@@ -33,7 +34,6 @@
 
 #include "private/svn_auth_private.h"
 
-#include "svn_private_config.h"
 
 /*-----------------------------------------------------------------------*/
 /* File provider                                                         */

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_server_trust_providers.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_server_trust_providers.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_server_trust_providers.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/ssl_server_trust_providers.c Thu Aug  1 14:55:32 2013
@@ -24,6 +24,7 @@
 
 #include <apr_pools.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_auth.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/subst.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/subst.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/subst.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/subst.c Thu Aug  1 14:55:32 2013
@@ -33,6 +33,7 @@
 #include <apr_file_io.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_types.h"
@@ -47,8 +48,6 @@
 #include "svn_pools.h"
 #include "private/svn_io_private.h"
 
-#include "svn_private_config.h"
-
 #include "private/svn_string_private.h"
 #include "private/svn_eol_private.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/types.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/types.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/types.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/types.c Thu Aug  1 14:55:32 2013
@@ -24,12 +24,12 @@
 #include <apr_pools.h>
 #include <apr_uuid.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_error.h"
 #include "svn_string.h"
 #include "svn_props.h"
-#include "svn_private_config.h"
 
 #include "private/svn_dep_compat.h"
 #include "private/svn_string_private.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/username_providers.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/username_providers.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/username_providers.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/username_providers.c Thu Aug  1 14:55:32 2013
@@ -28,6 +28,8 @@
 /*** Includes. ***/
 
 #include <apr_pools.h>
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_auth.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/utf.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/utf.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/utf.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/utf.c Thu Aug  1 14:55:32 2013
@@ -32,13 +32,13 @@
 #include <apr_xlate.h>
 #include <apr_atomic.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_string.h"
 #include "svn_error.h"
 #include "svn_pools.h"
 #include "svn_ctype.h"
 #include "svn_utf.h"
-#include "svn_private_config.h"
 #include "win32_xlate.h"
 
 #include "private/svn_utf_private.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_subr/win32_crypto.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_subr/win32_crypto.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_subr/win32_crypto.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_subr/win32_crypto.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,8 @@ typedef int win32_crypto__dummy;
 
 #include <apr_pools.h>
 #include <apr_base64.h>
+
+#include "svn_private_config.h"
 #include "svn_auth.h"
 #include "svn_error.h"
 #include "svn_hash.h"
@@ -42,8 +44,6 @@ typedef int win32_crypto__dummy;
 
 #include "private/svn_auth_private.h"
 
-#include "svn_private_config.h"
-
 #include <wincrypt.h>
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_crawler.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_crawler.c Thu Aug  1 14:55:32 2013
@@ -30,6 +30,7 @@
 #include <apr_file_io.h>
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_pools.h"
@@ -47,8 +48,6 @@
 #include "workqueue.h"
 #include "conflicts.h"
 
-#include "svn_private_config.h"
-
 
 /* Helper for report_revisions_and_depths().
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_files.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_files.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,7 @@
 #include <apr_file_io.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_error.h"
 #include "svn_io.h"
@@ -44,7 +45,6 @@
 #include "entries.h"
 #include "lock.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_ops.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/adm_ops.c Thu Aug  1 14:55:32 2013
@@ -36,6 +36,7 @@
 #include <apr_time.h>
 #include <apr_errno.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_pools.h"
 #include "svn_string.h"
@@ -53,7 +54,6 @@
 #include "conflicts.h"
 #include "workqueue.h"
 
-#include "svn_private_config.h"
 #include "private/svn_subr_private.h"
 #include "private/svn_dep_compat.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/conflicts.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/conflicts.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,7 @@
 #include <apr_hash.h>
 #include <apr_errno.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_pools.h"
@@ -52,8 +53,6 @@
 #include "private/svn_skel.h"
 #include "private/svn_string_private.h"
 
-#include "svn_private_config.h"
-
 /* --------------------------------------------------------------------
  * Conflict skel management
  */

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/copy.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/copy.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/copy.c Thu Aug  1 14:55:32 2013
@@ -28,6 +28,8 @@
 /*** Includes. ***/
 
 #include <string.h>
+
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_error.h"
 #include "svn_dirent_uri.h"
@@ -39,7 +41,6 @@
 #include "props.h"
 #include "conflicts.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/deprecated.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/deprecated.c Thu Aug  1 14:55:32 2013
@@ -28,6 +28,7 @@
 
 #include <apr_md5.h>
 
+#include "svn_private_config.h"
 #include "svn_wc.h"
 #include "svn_subst.h"
 #include "svn_pools.h"
@@ -47,8 +48,6 @@
 #include "translate.h"
 #include "workqueue.h"
 
-#include "svn_private_config.h"
-
 /* baton for traversal_info_update */
 struct traversal_info_update_baton
 {

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_editor.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_editor.c Thu Aug  1 14:55:32 2013
@@ -57,6 +57,7 @@
 
 #include <assert.h>
 
+#include "svn_private_config.h"
 #include "svn_error.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
@@ -75,8 +76,6 @@
 #include "translate.h"
 #include "diff.h"
 
-#include "svn_private_config.h"
-
 /*-------------------------------------------------------------------------*/
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_local.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_local.c Thu Aug  1 14:55:32 2013
@@ -31,6 +31,7 @@
 
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_error.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
@@ -45,8 +46,6 @@
 #include "translate.h"
 #include "diff.h"
 
-#include "svn_private_config.h"
-
 /*-------------------------------------------------------------------------*/
 
 /* Baton containing the state of a directory

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/entries.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/entries.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,7 @@
 
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_error.h"
 #include "svn_types.h"
 #include "svn_time.h"
@@ -45,7 +46,6 @@
 #include "wc_db.h"
 #include "wc-queries.h"  /* for STMT_*  */
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 #include "private/svn_sqlite.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/externals.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/externals.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/externals.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,7 @@
 #include <apr_general.h>
 #include <apr_uri.h>
 
+#include "svn_private_config.h"
 #include "svn_dirent_uri.h"
 #include "svn_path.h"
 #include "svn_error.h"
@@ -53,8 +54,6 @@
 #include "translate.h"
 #include "workqueue.h"
 #include "conflicts.h"
-
-#include "svn_private_config.h"
 
 /** Externals **/
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/info.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/info.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/info.c Thu Aug  1 14:55:32 2013
@@ -21,6 +21,7 @@
  * @endcopyright
  */
 
+#include "svn_private_config.h"
 #include "svn_dirent_uri.h"
 #include "svn_hash.h"
 #include "svn_path.h"
@@ -29,7 +30,6 @@
 
 #include "wc.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/lock.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/lock.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/lock.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,7 @@
 #include <apr_pools.h>
 #include <apr_time.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
 #include "svn_path.h"
@@ -39,7 +40,6 @@
 #include "props.h"
 #include "wc_db.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/node.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/node.c Thu Aug  1 14:55:32 2013
@@ -38,6 +38,7 @@
 #include <apr_pools.h>
 #include <apr_time.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
 #include "svn_path.h"
@@ -49,7 +50,6 @@
 #include "entries.h"
 #include "wc_db.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/old-and-busted.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/old-and-busted.c Thu Aug  1 14:55:32 2013
@@ -23,6 +23,7 @@
 
 
 
+#include "svn_private_config.h"
 #include "svn_time.h"
 #include "svn_xml.h"
 #include "svn_dirent_uri.h"
@@ -37,7 +38,6 @@
 #include "lock.h"
 
 #include "private/svn_wc_private.h"
-#include "svn_private_config.h"
 
 
 /* Within the (old) entries file, boolean values have a specific string

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/props.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/props.c Thu Aug  1 14:55:32 2013
@@ -33,6 +33,7 @@
 #include <apr_strings.h>
 #include <apr_general.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_pools.h"
@@ -60,8 +61,6 @@
 #include "workqueue.h"
 #include "conflicts.h"
 
-#include "svn_private_config.h"
-
 /* Forward declaration.  */
 static svn_error_t *
 prop_conflict_from_skel(const svn_string_t **conflict_desc,

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/revert.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/revert.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/revert.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/revert.c Thu Aug  1 14:55:32 2013
@@ -29,6 +29,7 @@
 #include <apr_pools.h>
 #include <apr_tables.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_pools.h"
 #include "svn_string.h"
@@ -43,7 +44,6 @@
 #include "adm_files.h"
 #include "workqueue.h"
 
-#include "svn_private_config.h"
 #include "private/svn_io_private.h"
 #include "private/svn_wc_private.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/status.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/status.c Thu Aug  1 14:55:32 2013
@@ -30,6 +30,7 @@
 #include <apr_file_io.h>
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_types.h"
 #include "svn_delta.h"
@@ -43,8 +44,6 @@
 #include "svn_hash.h"
 #include "svn_sorts.h"
 
-#include "svn_private_config.h"
-
 #include "wc.h"
 #include "props.h"
 #include "entries.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/translate.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/translate.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/translate.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/translate.c Thu Aug  1 14:55:32 2013
@@ -30,6 +30,7 @@
 #include <apr_file_io.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_dirent_uri.h"
@@ -45,11 +46,9 @@
 #include "translate.h"
 #include "props.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 
-
 /* */
 static svn_error_t *
 read_handler_unsupported(void *baton, char *buffer, apr_size_t *len)

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/update_editor.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/update_editor.c Thu Aug  1 14:55:32 2013
@@ -32,6 +32,7 @@
 #include <apr_tables.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_pools.h"
 #include "svn_hash.h"
@@ -40,7 +41,6 @@
 #include "svn_path.h"
 #include "svn_error.h"
 #include "svn_io.h"
-#include "svn_private_config.h"
 #include "svn_time.h"
 
 #include "wc.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/upgrade.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/upgrade.c Thu Aug  1 14:55:32 2013
@@ -23,6 +23,7 @@
 
 #include <apr_pools.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
@@ -38,7 +39,6 @@
 #include "wc-queries.h"  /* for STMT_*  */
 #include "workqueue.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 #include "private/svn_sqlite.h"
 #include "private/svn_token.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 #include <apr_pools.h>
 #include <apr_hash.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_error.h"
 #include "svn_dirent_uri.h"
@@ -48,7 +49,6 @@
 #include "workqueue.h"
 #include "token-map.h"
 
-#include "svn_private_config.h"
 #include "private/svn_sqlite.h"
 #include "private/svn_skel.h"
 #include "private/svn_wc_private.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_update_move.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_update_move.c Thu Aug  1 14:55:32 2013
@@ -78,6 +78,7 @@
 
 #include <assert.h>
 
+#include "svn_private_config.h"
 #include "svn_checksum.h"
 #include "svn_dirent_uri.h"
 #include "svn_error.h"

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_wcroot.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_wcroot.c Thu Aug  1 14:55:32 2013
@@ -25,6 +25,7 @@
 
 #include <assert.h>
 
+#include "svn_private_config.h"
 #include "svn_dirent_uri.h"
 #include "svn_hash.h"
 #include "svn_path.h"
@@ -35,8 +36,6 @@
 #include "wc_db_private.h"
 #include "wc-queries.h"
 
-#include "svn_private_config.h"
-
 /* ### Same values as wc_db.c */
 #define SDB_FILE  "wc.db"
 #define UNKNOWN_WC_ID ((apr_int64_t) -1)

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_wc/workqueue.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_wc/workqueue.c Thu Aug  1 14:55:32 2013
@@ -23,6 +23,7 @@
 
 #include <apr_pools.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
@@ -37,7 +38,6 @@
 #include "conflicts.h"
 #include "translate.h"
 
-#include "svn_private_config.h"
 #include "private/svn_skel.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/mod_dav_svn/repos.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/fsfs-improvements/subversion/mod_dav_svn/repos.c Thu Aug  1 14:55:32 2013
@@ -53,6 +53,7 @@
 #include "mod_dav_svn.h"
 #include "svn_ra.h"  /* for SVN_RA_CAPABILITY_* */
 #include "svn_dirent_uri.h"
+
 #include "private/svn_log.h"
 #include "private/svn_fspath.h"
 #include "private/svn_repos_private.h"

Modified: subversion/branches/fsfs-improvements/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/mod_dav_svn/version.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/mod_dav_svn/version.c (original)
+++ subversion/branches/fsfs-improvements/subversion/mod_dav_svn/version.c Thu Aug  1 14:55:32 2013
@@ -39,6 +39,7 @@
 #include "svn_dav.h"
 #include "svn_base64.h"
 #include "svn_version.h"
+
 #include "private/svn_repos_private.h"
 #include "private/svn_subr_private.h"
 #include "private/svn_dav_protocol.h"

Modified: subversion/branches/fsfs-improvements/subversion/svn/cl-conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/cl-conflicts.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/cl-conflicts.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/cl-conflicts.c Thu Aug  1 14:55:32 2013
@@ -21,6 +21,7 @@
  * ====================================================================
  */
 
+#include "svn_private_config.h"
 #include "cl-conflicts.h"
 #include "svn_hash.h"
 #include "svn_xml.h"
@@ -30,9 +31,6 @@
 
 #include "cl.h"
 
-#include "svn_private_config.h"
-
-
 /* A map for svn_wc_conflict_action_t values to XML strings */
 static const svn_token_map_t map_conflict_action_xml[] =
 {

Modified: subversion/branches/fsfs-improvements/subversion/svn/commit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/commit-cmd.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/commit-cmd.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/commit-cmd.c Thu Aug  1 14:55:32 2013
@@ -29,6 +29,7 @@
 
 #include <apr_general.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_error.h"
 #include "svn_error_codes.h"
@@ -40,8 +41,6 @@
 #include "svn_config.h"
 #include "cl.h"
 
-#include "svn_private_config.h"
-
 
 
 /* Wrapper notify_func2 function and baton for warning about

Modified: subversion/branches/fsfs-improvements/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/conflict-callbacks.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/conflict-callbacks.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 #define APR_WANT_STRFUNC
 #include <apr_want.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_client.h"
@@ -41,8 +42,6 @@
 
 #include "private/svn_cmdline_private.h"
 
-#include "svn_private_config.h"
-
 #define ARRAY_LEN(ary) ((sizeof (ary)) / (sizeof ((ary)[0])))
 
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/diff-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/diff-cmd.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/diff-cmd.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/diff-cmd.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 
 /*** Includes. ***/
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_client.h"
 #include "svn_string.h"
@@ -40,8 +41,6 @@
 #include "svn_hash.h"
 #include "cl.h"
 
-#include "svn_private_config.h"
-
 
 /*** Code. ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/help-cmd.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/help-cmd.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/help-cmd.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 
 /*** Includes. ***/
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_string.h"
 #include "svn_config.h"
@@ -34,8 +35,6 @@
 #include "svn_version.h"
 #include "cl.h"
 
-#include "svn_private_config.h"
-
 
 /*** Code. ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/notify.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/notify.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/notify.c Thu Aug  1 14:55:32 2013
@@ -31,6 +31,7 @@
 #define APR_WANT_STRFUNC
 #include <apr_want.h>
 
+#include "svn_private_config.h"
 #include "svn_cmdline.h"
 #include "svn_pools.h"
 #include "svn_dirent_uri.h"
@@ -41,8 +42,6 @@
 #include "private/svn_subr_private.h"
 #include "private/svn_dep_compat.h"
 
-#include "svn_private_config.h"
-
 
 /* Baton for notify and friends. */
 struct notify_baton

Modified: subversion/branches/fsfs-improvements/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/propedit-cmd.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/propedit-cmd.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/propedit-cmd.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 
 /*** Includes. ***/
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_wc.h"
@@ -41,7 +42,6 @@
 #include "cl.h"
 
 #include "private/svn_cmdline_private.h"
-#include "svn_private_config.h"
 
 
 /*** Code. ***/

Modified: subversion/branches/fsfs-improvements/subversion/svn/propget-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/propget-cmd.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/propget-cmd.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/propget-cmd.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 
 /*** Includes. ***/
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_pools.h"
@@ -45,8 +46,6 @@
 
 #include "private/svn_cmdline_private.h"
 
-#include "svn_private_config.h"
-
 
 /*** Code. ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/props.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/props.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/props.c Thu Aug  1 14:55:32 2013
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 
 #include <apr_hash.h>
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_string.h"
@@ -46,7 +48,6 @@
 #include "private/svn_string_private.h"
 #include "private/svn_cmdline_private.h"
 
-#include "svn_private_config.h"
 
 
 svn_error_t *

Modified: subversion/branches/fsfs-improvements/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/status-cmd.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/status-cmd.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/status-cmd.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 
 /*** Includes. ***/
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_string.h"
 #include "svn_wc.h"
@@ -40,7 +41,6 @@
 #include "svn_cmdline.h"
 #include "cl.h"
 
-#include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/status.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/status.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/status.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,8 @@
 
 
 /*** Includes. ***/
+
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_wc.h"
@@ -33,7 +35,6 @@
 #include "svn_xml.h"
 #include "svn_time.h"
 #include "cl.h"
-#include "svn_private_config.h"
 #include "cl-conflicts.h"
 #include "private/svn_wc_private.h"
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/svn.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/svn.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/svn.c Thu Aug  1 14:55:32 2013
@@ -35,6 +35,7 @@
 #include <apr_general.h>
 #include <apr_signal.h>
 
+#include "svn_private_config.h"
 #include "svn_cmdline.h"
 #include "svn_pools.h"
 #include "svn_wc.h"
@@ -57,8 +58,6 @@
 #include "private/svn_opt_private.h"
 #include "private/svn_cmdline_private.h"
 
-#include "svn_private_config.h"
-
 
 /*** Option Processing ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn/util.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn/util.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svn/util.c Thu Aug  1 14:55:32 2013
@@ -41,6 +41,7 @@
 #include <apr_general.h>
 #include <apr_lib.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_error.h"
 #include "svn_ctype.h"
@@ -58,7 +59,6 @@
 #include "svn_xml.h"
 #include "svn_time.h"
 #include "svn_props.h"
-#include "svn_private_config.h"
 #include "cl.h"
 
 #include "private/svn_token.h"

Modified: subversion/branches/fsfs-improvements/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svn_private_config.hw?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svn_private_config.hw (original)
+++ subversion/branches/fsfs-improvements/subversion/svn_private_config.hw Thu Aug  1 14:55:32 2013
@@ -48,7 +48,6 @@
 #define SVN_FS_WANT_DB_MINOR    0
 #define SVN_FS_WANT_DB_PATCH    14
 
-
 /* Path separator for local filesystem */
 #define SVN_PATH_LOCAL_SEPARATOR '\\'
 

Modified: subversion/branches/fsfs-improvements/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnadmin/svnadmin.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnadmin/svnadmin.c Thu Aug  1 14:55:32 2013
@@ -25,6 +25,7 @@
 #include <apr_file_io.h>
 #include <apr_signal.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_cmdline.h"
@@ -48,8 +49,6 @@
 #include "private/svn_subr_private.h"
 #include "private/svn_cmdline_private.h"
 
-#include "svn_private_config.h"
-
 
 /*** Code. ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svnauth/svnauth.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnauth/svnauth.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnauth/svnauth.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnauth/svnauth.c Thu Aug  1 14:55:32 2013
@@ -33,6 +33,7 @@
 #include <serf.h>
 #endif
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_error.h"
 #include "svn_opt.h"

Modified: subversion/branches/fsfs-improvements/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnlook/svnlook.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnlook/svnlook.c Thu Aug  1 14:55:32 2013
@@ -34,6 +34,7 @@
 #define APR_WANT_STRFUNC
 #include <apr_want.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_types.h"
@@ -59,8 +60,6 @@
 #include "private/svn_fspath.h"
 #include "private/svn_io_private.h"
 
-#include "svn_private_config.h"
-
 
 /*** Some convenience macros and types. ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnmucc/svnmucc.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnmucc/svnmucc.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnmucc/svnmucc.c Thu Aug  1 14:55:32 2013
@@ -40,6 +40,7 @@
 
 #include <apr_lib.h>
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_client.h"
 #include "svn_cmdline.h"
@@ -58,8 +59,6 @@
 #include "private/svn_ra_private.h"
 #include "private/svn_string_private.h"
 
-#include "svn_private_config.h"
-
 static void handle_error(svn_error_t *err, apr_pool_t *pool)
 {
   if (err)

Modified: subversion/branches/fsfs-improvements/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnrdump/dump_editor.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnrdump/dump_editor.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnrdump/dump_editor.c Thu Aug  1 14:55:32 2013
@@ -22,6 +22,7 @@
  * ====================================================================
  */
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_repos.h"

Modified: subversion/branches/fsfs-improvements/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnrdump/svnrdump.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnrdump/svnrdump.c Thu Aug  1 14:55:32 2013
@@ -25,6 +25,7 @@
 #include <apr_signal.h>
 #include <apr_uri.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_cmdline.h"
 #include "svn_client.h"
@@ -33,7 +34,6 @@
 #include "svn_repos.h"
 #include "svn_path.h"
 #include "svn_utf.h"
-#include "svn_private_config.h"
 #include "svn_string.h"
 #include "svn_props.h"
 
@@ -42,7 +42,6 @@
 #include "private/svn_cmdline_private.h"
 #include "private/svn_ra_private.h"
 
-
 
 /*** Cancellation ***/
 

Modified: subversion/branches/fsfs-improvements/subversion/svnrdump/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnrdump/util.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnrdump/util.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnrdump/util.c Thu Aug  1 14:55:32 2013
@@ -21,6 +21,7 @@
  * ====================================================================
  */
 
+#include "svn_private_config.h"
 #include "svn_error.h"
 #include "svn_pools.h"
 #include "svn_string.h"

Modified: subversion/branches/fsfs-improvements/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnserve/serve.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnserve/serve.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnserve/serve.c Thu Aug  1 14:55:32 2013
@@ -33,8 +33,8 @@
 #include <apr_lib.h>
 #include <apr_strings.h>
 
+#include "svn_private_config.h"
 #include "svn_compat.h"
-#include "svn_private_config.h"  /* For SVN_PATH_LOCAL_SEPARATOR */
 #include "svn_hash.h"
 #include "svn_types.h"
 #include "svn_string.h"

Modified: subversion/branches/fsfs-improvements/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnsync/svnsync.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnsync/svnsync.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnsync/svnsync.c Thu Aug  1 14:55:32 2013
@@ -19,6 +19,7 @@
  * ====================================================================
  */
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_config.h"
@@ -41,8 +42,6 @@
 
 #include "sync.h"
 
-#include "svn_private_config.h"
-
 #include <apr_signal.h>
 #include <apr_uuid.h>
 

Modified: subversion/branches/fsfs-improvements/subversion/svnsync/sync.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/svnsync/sync.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/svnsync/sync.c (original)
+++ subversion/branches/fsfs-improvements/subversion/svnsync/sync.c Thu Aug  1 14:55:32 2013
@@ -19,6 +19,7 @@
  * ====================================================================
  */
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_cmdline.h"
 #include "svn_config.h"
@@ -36,8 +37,6 @@
 
 #include "sync.h"
 
-#include "svn_private_config.h"
-
 #include <apr_network_io.h>
 #include <apr_signal.h>
 #include <apr_uuid.h>

Propchange: subversion/branches/fsfs-improvements/subversion/tests/cmdline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug  1 14:55:32 2013
@@ -8,3 +8,4 @@ httpd-*
 entries-dump
 atomic-ra-revprop-change
 .libs
+.davautocheck.sh.stop

Modified: subversion/branches/fsfs-improvements/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/tests/cmdline/commit_tests.py?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/fsfs-improvements/subversion/tests/cmdline/commit_tests.py Thu Aug  1 14:55:32 2013
@@ -2962,7 +2962,60 @@ def commit_unversioned(sbox):
   # Unversioned, not existing
   svntest.actions.run_and_verify_commit(wc_dir, None, None, expected_err,
                                          sbox.ospath('not-existing'))
-                                         
+
+@Issue(4400)
+def commit_cp_with_deep_delete(sbox):
+  "verify behavior of a copy with a deep (>=3) delete"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  # Prep by adding a tree deep enough to exercise the issue.
+  sbox.simple_mkdir('A/B/E/I')
+  sbox.simple_commit(message='prep')
+  svntest.main.run_svn(None, 'up', wc_dir)
+
+  # copy the deep tree and then delete a dir 3 deep.
+  sbox.simple_copy('A','A2')
+  sbox.simple_rm('A2/B/E/I')
+
+  # come up with the expected output and status
+  expected_output = svntest.wc.State(wc_dir, {
+    'A2'       : Item(verb='Adding'),
+    'A2/B/E/I' : Item(verb='Deleting'),
+    })
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+  expected_status.add({
+    'A/B/E/I'           : Item(status='  ', wc_rev='2'),
+    'A2'                : Item(status='  ', wc_rev='3'),
+    'A2/B'              : Item(status='  ', wc_rev='3'),
+    'A2/B/lambda'       : Item(status='  ', wc_rev='3'),
+    'A2/B/F'            : Item(status='  ', wc_rev='3'),
+    'A2/B/E'            : Item(status='  ', wc_rev='3'),
+    'A2/B/E/alpha'      : Item(status='  ', wc_rev='3'),
+    'A2/B/E/beta'       : Item(status='  ', wc_rev='3'),
+    'A2/D'              : Item(status='  ', wc_rev='3'),
+    'A2/D/gamma'        : Item(status='  ', wc_rev='3'),
+    'A2/D/H'            : Item(status='  ', wc_rev='3'),
+    'A2/D/H/psi'        : Item(status='  ', wc_rev='3'),
+    'A2/D/H/omega'      : Item(status='  ', wc_rev='3'),
+    'A2/D/H/chi'        : Item(status='  ', wc_rev='3'),
+    'A2/D/G'            : Item(status='  ', wc_rev='3'),
+    'A2/D/G/tau'        : Item(status='  ', wc_rev='3'),
+    'A2/D/G/rho'        : Item(status='  ', wc_rev='3'),
+    'A2/D/G/pi'         : Item(status='  ', wc_rev='3'),
+    'A2/C'              : Item(status='  ', wc_rev='3'),
+    'A2/mu'             : Item(status='  ', wc_rev='3'),
+    })
+
+  # Commit the copy without the one dir.
+  svntest.actions.run_and_verify_commit(wc_dir,
+                                        expected_output,
+                                        expected_status,
+                                        None,
+                                        wc_dir)
+
+  
 
 ########################################################################
 # Run the tests
@@ -3036,6 +3089,7 @@ test_list = [ None,
               commit_danglers,
               last_changed_of_copied_subdir,
               commit_unversioned,
+              commit_cp_with_deep_delete,
              ]
 
 if __name__ == '__main__':

Modified: subversion/branches/fsfs-improvements/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/tests/cmdline/davautocheck.sh?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/fsfs-improvements/subversion/tests/cmdline/davautocheck.sh Thu Aug  1 14:55:32 2013
@@ -27,7 +27,7 @@
 # testing are:
 #   - Subversion built using --enable-shared --enable-dso --with-apxs options,
 #   - Working Apache 2 HTTPD Server with the apxs program reachable through
-#     PATH or specified via the APXS environment variable,
+#     PATH or specified via the APXS Makefile variable or environment variable,
 #   - Modules dav_module and log_config_module compiled as DSO or built into
 #     Apache HTTPD Server executable.
 # The basic intension of this script is to be able to perform "make check"
@@ -79,12 +79,14 @@
 # environment.
 #
 # Passing --no-tests as argv[1] will have the script start a server
-# but not run any tests.
+# but not run any tests.  Passing --gdb will do the same, and in addition
+# spawn gdb in the foreground attached to the running server.
 
 PYTHON=${PYTHON:-python}
 
 SCRIPTDIR=$(dirname $0)
 SCRIPT=$(basename $0)
+STOPSCRIPT=$SCRIPTDIR/.$SCRIPT.stop
 
 trap stop_httpd_and_die HUP TERM INT
 
@@ -113,13 +115,17 @@ query() {
     read -n 1 -t 32
   else
     # 
-    prog=$(cat) <<'EOF'
+    prog="
 import select as s
 import sys
+import tty, termios
+tty.setcbreak(sys.stdin.fileno(), termios.TCSANOW)
 if s.select([sys.stdin.fileno()], [], [], 32)[0]:
   sys.stdout.write(sys.stdin.read(1))
-EOF
-    REPLY=`stty cbreak; $PYTHON -c "$prog" "$@"; stty -cbreak`
+"
+    stty_state=`stty -g`
+    REPLY=`$PYTHON -u -c "$prog" "$@"`
+    stty $stty_state
   fi
   echo
   [ "${REPLY:-$2}" = 'y' ]
@@ -157,8 +163,20 @@ get_prog_name() {
 }
 
 # Don't assume sbin is in the PATH.
+# ### Presumably this is used to locate /usr/sbin/apxs or /usr/sbin/apache2    
 PATH="$PATH:/usr/sbin:/usr/local/sbin"
 
+# Find the source and build directories. The build dir can be found if it is
+# the current working dir or the source dir.
+ABS_SRCDIR=$(cd ${SCRIPTDIR}/../../../; pwd)
+if [ -x subversion/svn/svn ]; then
+  ABS_BUILDDIR=$(pwd)
+elif [ -x $ABS_SRCDIR/subversion/svn/svn ]; then
+  ABS_BUILDDIR=$ABS_SRCDIR
+else
+  fail "Run this script from the root of Subversion's build tree!"
+fi
+
 # Remove any proxy environmental variables that affect wget or curl.
 # We don't need a proxy to connect to localhost and having the proxy
 # environmental variables set breaks the Apache configuration file
@@ -169,10 +187,18 @@ unset http_proxy
 unset HTTPS_PROXY
 
 # Pick up value from environment or PATH (also try apxs2 - for Debian)
-[ ${APXS:+set} ] \
- || APXS=$(which apxs) \
- || APXS=$(which apxs2) \
- || fail "neither apxs or apxs2 found - required to run davautocheck"
+if [ ${APXS:+set} ]; then
+  :
+elif APXS=$(grep '^APXS' $ABS_BUILDDIR/Makefile | sed 's/^APXS *= *//') && \
+     [ -n "$APXS" ]; then
+  :
+elif APXS=$(which apxs); then
+  :
+elif APXS=$(which apxs2); then
+  :
+else
+  fail "neither apxs or apxs2 found - required to run davautocheck"
+fi
 
 [ -x $APXS ] || fail "Can't execute apxs executable $APXS"
 
@@ -195,17 +221,6 @@ if [ ${CACHE_REVPROPS:+set} ]; then
   CACHE_REVPROPS_SETTING=on
 fi
 
-# Find the source and build directories. The build dir can be found if it is
-# the current working dir or the source dir.
-ABS_SRCDIR=$(cd ${SCRIPTDIR}/../../../; pwd)
-if [ -x subversion/svn/svn ]; then
-  ABS_BUILDDIR=$(pwd)
-elif [ -x $ABS_SRCDIR/subversion/svn/svn ]; then
-  ABS_BUILDDIR=$ABS_SRCDIR
-else
-  fail "Run this script from the root of Subversion's build tree!"
-fi
-
 if [ ${MODULE_PATH:+set} ]; then
     MOD_DAV_SVN="$MODULE_PATH/mod_dav_svn.so"
     MOD_AUTHZ_SVN="$MODULE_PATH/mod_authz_svn.so"
@@ -300,17 +315,16 @@ if [ ${USE_SSL:+set} ]; then
       || fail "SSL module not found"
 fi
 
-random_port() {
-  if [ -n "$BASH_VERSION" ]; then
-    echo $(($RANDOM+1024))
-  else
-    $PYTHON -c 'import random; print random.randint(1024, 2**16-1)'
-  fi
-}
+# Stop any previous instances, os we can re-use the port.
+if [ -x $STOPSCRIPT ]; then $STOPSCRIPT ; sleep 1; fi
 
-HTTPD_PORT=$(random_port)
-while netstat -an | grep $HTTPD_PORT | grep 'LISTEN'; do
-  HTTPD_PORT=$(random_port)
+HTTPD_PORT=3691
+while netstat -an | grep $HTTPD_PORT | grep 'LISTEN' >/dev/null; do
+  HTTPD_PORT=$(( HTTPD_PORT + 1 ))
+  if [ $HTTPD_PORT -eq 65536 ]; then
+    # Most likely the loop condition is true regardless of $HTTPD_PORT
+    fail "netstat claims you have no free ports for httpd to listen on."
+  fi
 done
 HTTPD_ROOT="$ABS_BUILDDIR/subversion/tests/cmdline/httpd-$(date '+%Y%m%d-%H%M%S')"
 HTTPD_CFG="$HTTPD_ROOT/cfg"
@@ -492,6 +506,20 @@ RedirectMatch           ^/svn-test-work/
 __EOF__
 
 START="$HTTPD -f $HTTPD_CFG"
+printf \
+'#!/bin/sh
+if [ -d "%s" ]; then
+  printf "Stopping previous HTTPD instance..."
+  if %s -k stop; then
+    # httpd had no output; echo a newline.
+    echo ""
+  elif [ -s "%s" ]; then
+    # httpd would have printed an error terminated by a newline.
+    kill -9 "`cat %s`"
+  fi
+fi
+' >$STOPSCRIPT "$HTTPD_ROOT" "$START" "$HTTPD_PID" "$HTTPD_PID"
+chmod +x $STOPSCRIPT
 
 $START -t \
   || fail "Configuration file didn't pass the check, most likely modules couldn't be loaded"
@@ -532,6 +560,13 @@ if [ $# -eq 1 ] && [ "x$1" = 'x--no-test
   exit
 fi
 
+if [ $# -eq 1 ] && [ "x$1" = 'x--gdb' ]; then
+  echo "http://localhost:$HTTPD_PORT/svn-test-work/repositories"
+  $STOPSCRIPT && gdb -silent -ex r -args $START -X
+  exit
+fi
+
+
 if type time > /dev/null; then
   TIME_CMD=time
 else

Modified: subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs/fs-test.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs/fs-test.c Thu Aug  1 14:55:32 2013
@@ -27,6 +27,7 @@
 
 #include "../svn_test.h"
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_time.h"

Modified: subversion/branches/fsfs-improvements/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/tests/libsvn_repos/repos-test.c?rev=1509270&r1=1509269&r2=1509270&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/fsfs-improvements/subversion/tests/libsvn_repos/repos-test.c Thu Aug  1 14:55:32 2013
@@ -26,6 +26,7 @@
 
 #include "../svn_test.h"
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_error.h"
 #include "svn_fs.h"



Mime
View raw message