subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1509247 [3/3] - in /subversion/branches/fsx: ./ subversion/ subversion/bindings/cxxhl/src/ subversion/bindings/cxxhl/src/aprwrap/ subversion/bindings/cxxhl/tests/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache...
Date Thu, 01 Aug 2013 14:22:08 GMT
Modified: subversion/branches/fsx/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/info.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/info.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/info.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/lock.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/lock.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/lock.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/node.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/node.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/node.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/old-and-busted.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/old-and-busted.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/props.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/props.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/revert.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/revert.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/revert.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/revert.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/status.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/status.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/translate.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/translate.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/translate.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/translate.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/update_editor.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/update_editor.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/upgrade.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/upgrade.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/wc_db.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/wc_db.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/wc_db_update_move.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/wc_db_update_move.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/wc_db_wcroot.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/wc_db_wcroot.c Thu Aug  1 14:22:03 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/fsx/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_wc/workqueue.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/fsx/subversion/libsvn_wc/workqueue.c Thu Aug  1 14:22:03 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/fsx/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/mod_dav_svn/repos.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/fsx/subversion/mod_dav_svn/repos.c Thu Aug  1 14:22:03 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/fsx/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/mod_dav_svn/version.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/mod_dav_svn/version.c (original)
+++ subversion/branches/fsx/subversion/mod_dav_svn/version.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/cl-conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/cl-conflicts.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/cl-conflicts.c (original)
+++ subversion/branches/fsx/subversion/svn/cl-conflicts.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/commit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/commit-cmd.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/commit-cmd.c (original)
+++ subversion/branches/fsx/subversion/svn/commit-cmd.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/conflict-callbacks.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/fsx/subversion/svn/conflict-callbacks.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/diff-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/diff-cmd.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/diff-cmd.c (original)
+++ subversion/branches/fsx/subversion/svn/diff-cmd.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/help-cmd.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/help-cmd.c (original)
+++ subversion/branches/fsx/subversion/svn/help-cmd.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/notify.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/notify.c (original)
+++ subversion/branches/fsx/subversion/svn/notify.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/propedit-cmd.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/propedit-cmd.c (original)
+++ subversion/branches/fsx/subversion/svn/propedit-cmd.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/propget-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/propget-cmd.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/propget-cmd.c (original)
+++ subversion/branches/fsx/subversion/svn/propget-cmd.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/props.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/props.c (original)
+++ subversion/branches/fsx/subversion/svn/props.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/status-cmd.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/status-cmd.c (original)
+++ subversion/branches/fsx/subversion/svn/status-cmd.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/status.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/status.c (original)
+++ subversion/branches/fsx/subversion/svn/status.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/svn.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/svn.c (original)
+++ subversion/branches/fsx/subversion/svn/svn.c Thu Aug  1 14:22:03 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/fsx/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn/util.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn/util.c (original)
+++ subversion/branches/fsx/subversion/svn/util.c Thu Aug  1 14:22:03 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/fsx/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svn_private_config.hw?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svn_private_config.hw (original)
+++ subversion/branches/fsx/subversion/svn_private_config.hw Thu Aug  1 14:22:03 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/fsx/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnadmin/svnadmin.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/fsx/subversion/svnadmin/svnadmin.c Thu Aug  1 14:22:03 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/fsx/subversion/svnauth/svnauth.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnauth/svnauth.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnauth/svnauth.c (original)
+++ subversion/branches/fsx/subversion/svnauth/svnauth.c Thu Aug  1 14:22:03 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/fsx/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnlook/svnlook.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnlook/svnlook.c (original)
+++ subversion/branches/fsx/subversion/svnlook/svnlook.c Thu Aug  1 14:22:03 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/fsx/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnmucc/svnmucc.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnmucc/svnmucc.c (original)
+++ subversion/branches/fsx/subversion/svnmucc/svnmucc.c Thu Aug  1 14:22:03 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/fsx/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnrdump/dump_editor.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnrdump/dump_editor.c (original)
+++ subversion/branches/fsx/subversion/svnrdump/dump_editor.c Thu Aug  1 14:22:03 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/fsx/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnrdump/svnrdump.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/fsx/subversion/svnrdump/svnrdump.c Thu Aug  1 14:22:03 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/fsx/subversion/svnrdump/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnrdump/util.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnrdump/util.c (original)
+++ subversion/branches/fsx/subversion/svnrdump/util.c Thu Aug  1 14:22:03 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/fsx/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnserve/serve.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnserve/serve.c (original)
+++ subversion/branches/fsx/subversion/svnserve/serve.c Thu Aug  1 14:22:03 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/fsx/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnsync/svnsync.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnsync/svnsync.c (original)
+++ subversion/branches/fsx/subversion/svnsync/svnsync.c Thu Aug  1 14:22:03 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/fsx/subversion/svnsync/sync.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/svnsync/sync.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/svnsync/sync.c (original)
+++ subversion/branches/fsx/subversion/svnsync/sync.c Thu Aug  1 14:22:03 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/fsx/subversion/tests/cmdline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug  1 14:22:03 2013
@@ -8,3 +8,4 @@ httpd-*
 entries-dump
 atomic-ra-revprop-change
 .libs
+.davautocheck.sh.stop

Modified: subversion/branches/fsx/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/cmdline/davautocheck.sh?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/fsx/subversion/tests/cmdline/davautocheck.sh Thu Aug  1 14:22:03 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/fsx/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_fs/fs-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_fs/fs-test.c Thu Aug  1 14:22:03 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"

Propchange: subversion/branches/fsx/subversion/tests/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/tests/libsvn_fs_x:r1507845-1509236

Modified: subversion/branches/fsx/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_repos/repos-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_repos/repos-test.c Thu Aug  1 14:22:03 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"

Modified: subversion/branches/fsx/subversion/tests/libsvn_subr/hashdump-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_subr/hashdump-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_subr/hashdump-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_subr/hashdump-test.c Thu Aug  1 14:22:03 2013
@@ -31,6 +31,7 @@
 
 #include "../svn_test.h"
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_error.h"

Modified: subversion/branches/fsx/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_subr/mergeinfo-test.c Thu Aug  1 14:22:03 2013
@@ -28,6 +28,7 @@
 
 #define SVN_DEPRECATED
 
+#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_types.h"

Modified: subversion/branches/fsx/subversion/tests/libsvn_subr/spillbuf-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_subr/spillbuf-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_subr/spillbuf-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_subr/spillbuf-test.c Thu Aug  1 14:22:03 2013
@@ -57,10 +57,8 @@ check_read(svn_spillbuf_t *buf,
 
 
 static svn_error_t *
-test_spillbuf_basic(apr_pool_t *pool)
+test_spillbuf__basic(apr_pool_t *pool, apr_size_t len, svn_spillbuf_t *buf)
 {
-  apr_size_t len = strlen(basic_data);  /* Don't include basic_data's NUL  */
-  svn_spillbuf_t *buf = svn_spillbuf__create(len, 10 * len, pool);
   int i;
   const char *readptr;
   apr_size_t readlen;
@@ -87,6 +85,22 @@ test_spillbuf_basic(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+test_spillbuf_basic(apr_pool_t *pool)
+{
+  apr_size_t len = strlen(basic_data);  /* Don't include basic_data's NUL  */
+  svn_spillbuf_t *buf = svn_spillbuf__create(len, 10 * len, pool);
+  return test_spillbuf__basic(pool, len, buf);
+}
+
+static svn_error_t *
+test_spillbuf_basic_spill_all(apr_pool_t *pool)
+{
+  apr_size_t len = strlen(basic_data);  /* Don't include basic_data's NUL  */
+  svn_spillbuf_t *buf =
+    svn_spillbuf__create_extended(len, 10 * len, TRUE, TRUE, NULL, pool);
+  return test_spillbuf__basic(pool, len, buf);
+}
 
 static svn_error_t *
 read_callback(svn_boolean_t *stop,
@@ -107,12 +121,8 @@ read_callback(svn_boolean_t *stop,
 
 
 static svn_error_t *
-test_spillbuf_callback(apr_pool_t *pool)
+test_spillbuf__callback(apr_pool_t *pool, svn_spillbuf_t *buf)
 {
-  svn_spillbuf_t *buf = svn_spillbuf__create(
-                          sizeof(basic_data) /* blocksize */,
-                          10 * sizeof(basic_data) /* maxsize */,
-                          pool);
   int i;
   int counter;
   svn_boolean_t exhausted;
@@ -133,15 +143,31 @@ test_spillbuf_callback(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
-
 static svn_error_t *
-test_spillbuf_file(apr_pool_t *pool)
+test_spillbuf_callback(apr_pool_t *pool)
 {
-  apr_size_t altsize = sizeof(basic_data) + 2;
   svn_spillbuf_t *buf = svn_spillbuf__create(
-                          altsize /* blocksize */,
-                          2 * sizeof(basic_data) /* maxsize */,
+                          sizeof(basic_data) /* blocksize */,
+                          10 * sizeof(basic_data) /* maxsize */,
                           pool);
+  return test_spillbuf__callback(pool, buf);
+}
+
+static svn_error_t *
+test_spillbuf_callback_spill_all(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create_extended(
+                          sizeof(basic_data) /* blocksize */,
+                          10 * sizeof(basic_data) /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__callback(pool, buf);
+}
+
+static svn_error_t *
+test_spillbuf__file(apr_pool_t *pool, apr_size_t altsize, svn_spillbuf_t *buf)
+{
   int i;
   const char *readptr;
   apr_size_t readlen;
@@ -203,14 +229,33 @@ test_spillbuf_file(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+test_spillbuf_file(apr_pool_t *pool)
+{
+  apr_size_t altsize = sizeof(basic_data) + 2;
+  svn_spillbuf_t *buf = svn_spillbuf__create(
+                          altsize /* blocksize */,
+                          2 * sizeof(basic_data) /* maxsize */,
+                          pool);
+  return test_spillbuf__file(pool, altsize, buf);
+}
 
 static svn_error_t *
-test_spillbuf_interleaving(apr_pool_t *pool)
+test_spillbuf_file_spill_all(apr_pool_t *pool)
 {
-  svn_spillbuf_t *buf = svn_spillbuf__create(8 /* blocksize */,
-                                             15 /* maxsize */,
-                                             pool);
+  apr_size_t altsize = sizeof(basic_data) + 2;
+  svn_spillbuf_t *buf = svn_spillbuf__create_extended(
+                          altsize /* blocksize */,
+                          2 * sizeof(basic_data)  /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__file(pool, altsize, buf);
+}
 
+static svn_error_t *
+test_spillbuf__interleaving(apr_pool_t *pool, svn_spillbuf_t* buf)
+{
   SVN_ERR(svn_spillbuf__write(buf, "abcdef", 6, pool));
   SVN_ERR(svn_spillbuf__write(buf, "ghijkl", 6, pool));
   /* now: two blocks: 8 and 4 bytes  */
@@ -238,18 +283,33 @@ test_spillbuf_interleaving(apr_pool_t *p
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+test_spillbuf_interleaving(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create(8 /* blocksize */,
+                                             15 /* maxsize */,
+                                             pool);
+  return test_spillbuf__interleaving(pool, buf);
+}
 
 static svn_error_t *
-test_spillbuf_reader(apr_pool_t *pool)
+test_spillbuf_interleaving_spill_all(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create_extended(
+                          8 /* blocksize */,
+                          15 /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__interleaving(pool, buf);
+}
+
+static svn_error_t *
+test_spillbuf__reader(apr_pool_t *pool, svn_spillbuf_reader_t *sbr)
 {
-  svn_spillbuf_reader_t *sbr;
   apr_size_t amt;
   char buf[10];
 
-  sbr = svn_spillbuf__reader_create(4 /* blocksize */,
-                                    100 /* maxsize */,
-                                    pool);
-
   SVN_ERR(svn_spillbuf__reader_write(sbr, "abcdef", 6, pool));
 
   /* Get a buffer from the underlying reader, and grab a couple bytes.  */
@@ -270,14 +330,30 @@ test_spillbuf_reader(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+test_spillbuf_reader(apr_pool_t *pool)
+{
+  svn_spillbuf_reader_t *sbr = svn_spillbuf__reader_create(4 /* blocksize */,
+                                                           100 /* maxsize */,
+                                                           pool);
+  return test_spillbuf__reader(pool, sbr);
+}
 
 static svn_error_t *
-test_spillbuf_stream(apr_pool_t *pool)
+test_spillbuf_reader_spill_all(apr_pool_t *pool)
+{
+  svn_spillbuf_reader_t *sbr = svn_spillbuf__reader_create_extended(
+                          4 /* blocksize */,
+                          100 /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__reader(pool, sbr);
+}
+
+static svn_error_t *
+test_spillbuf__stream(apr_pool_t *pool, svn_stream_t *stream)
 {
-  svn_spillbuf_t *buf = svn_spillbuf__create(8 /* blocksize */,
-                                             15 /* maxsize */,
-                                             pool);
-  svn_stream_t *stream = svn_stream__from_spillbuf(buf, pool);
   char readbuf[256];
   apr_size_t readlen;
   apr_size_t writelen;
@@ -320,14 +396,31 @@ test_spillbuf_stream(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
-
 static svn_error_t *
-test_spillbuf_rwfile(apr_pool_t *pool)
+test_spillbuf_stream(apr_pool_t *pool)
 {
-  svn_spillbuf_t *buf = svn_spillbuf__create(4 /* blocksize */,
-                                             10 /* maxsize */,
+  svn_spillbuf_t *buf = svn_spillbuf__create(8 /* blocksize */,
+                                             15 /* maxsize */,
                                              pool);
+  svn_stream_t *stream = svn_stream__from_spillbuf(buf, pool);
+  return test_spillbuf__stream(pool, stream);
+}
 
+static svn_error_t *
+test_spillbuf_stream_spill_all(apr_pool_t *pool)
+{
+  svn_stream_t *stream = svn_stream__from_spillbuf_extended(
+                          8 /* blocksize */,
+                          15 /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__stream(pool, stream);
+}
+
+static svn_error_t *
+test_spillbuf__rwfile(apr_pool_t *pool, svn_spillbuf_t *buf)
+{
   SVN_ERR(svn_spillbuf__write(buf, "abcdef", 6, pool));
   SVN_ERR(svn_spillbuf__write(buf, "ghijkl", 6, pool));
   SVN_ERR(svn_spillbuf__write(buf, "mnopqr", 6, pool));
@@ -361,14 +454,30 @@ test_spillbuf_rwfile(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
-
 static svn_error_t *
-test_spillbuf_eof(apr_pool_t *pool)
+test_spillbuf_rwfile(apr_pool_t *pool)
 {
   svn_spillbuf_t *buf = svn_spillbuf__create(4 /* blocksize */,
                                              10 /* maxsize */,
                                              pool);
+  return test_spillbuf__rwfile(pool, buf);
+}
+
+static svn_error_t *
+test_spillbuf_rwfile_spill_all(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create_extended(
+                          4 /* blocksize */,
+                          10 /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__rwfile(pool, buf);
+}
 
+static svn_error_t *
+test_spillbuf__eof(apr_pool_t *pool, svn_spillbuf_t *buf)
+{
   SVN_ERR(svn_spillbuf__write(buf, "abcdef", 6, pool));
   SVN_ERR(svn_spillbuf__write(buf, "ghijkl", 6, pool));
   /* now: two blocks: 4 and 2 bytes, and 6 bytes in spill file.  */
@@ -416,19 +525,107 @@ test_spillbuf_eof(apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+test_spillbuf_eof(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create(4 /* blocksize */,
+                                             10 /* maxsize */,
+                                             pool);
+  return test_spillbuf__eof(pool, buf);
+}
+
+static svn_error_t *
+test_spillbuf_eof_spill_all(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create_extended(
+                          4 /* blocksize */,
+                          10 /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__eof(pool, buf);
+}
+
+static svn_error_t *
+test_spillbuf__file_attrs(apr_pool_t *pool, svn_boolean_t spill_all,
+                          svn_spillbuf_t *buf)
+{
+  apr_finfo_t finfo;
+
+  SVN_ERR(svn_spillbuf__write(buf, "abcdef", 6, pool));
+  SVN_ERR(svn_spillbuf__write(buf, "ghijkl", 6, pool));
+  SVN_ERR(svn_spillbuf__write(buf, "mnopqr", 6, pool));
+
+  /* Check that the spillbuf size is what we expect it to be */
+  SVN_TEST_ASSERT(svn_spillbuf__get_size(buf) == 18);
+
+  /* Check file existence */
+  SVN_TEST_ASSERT(svn_spillbuf__get_filename(buf) != NULL);
+  SVN_TEST_ASSERT(svn_spillbuf__get_file(buf) != NULL);
+
+  /* The size of the file must match expectations */
+  SVN_ERR(svn_io_file_info_get(&finfo, APR_FINFO_SIZE,
+                               svn_spillbuf__get_file(buf), pool));
+  if (spill_all)
+    SVN_TEST_ASSERT(finfo.size == svn_spillbuf__get_size(buf));
+  else
+    SVN_TEST_ASSERT(finfo.size == (svn_spillbuf__get_size(buf)
+                                   - svn_spillbuf__get_memory_size(buf)));
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+test_spillbuf_file_attrs(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create(4 /* blocksize */,
+                                             10 /* maxsize */,
+                                             pool);
+  return test_spillbuf__file_attrs(pool, FALSE, buf);
+}
+
+static svn_error_t *
+test_spillbuf_file_attrs_spill_all(apr_pool_t *pool)
+{
+  svn_spillbuf_t *buf = svn_spillbuf__create_extended(
+                          4 /* blocksize */,
+                          10 /* maxsize */,
+                          TRUE /* delte on close */,
+                          TRUE /* spill all data */,
+                          NULL, pool);
+  return test_spillbuf__file_attrs(pool, TRUE, buf);
+}
 
 /* The test table.  */
 struct svn_test_descriptor_t test_funcs[] =
   {
     SVN_TEST_NULL,
     SVN_TEST_PASS2(test_spillbuf_basic, "basic spill buffer test"),
+    SVN_TEST_PASS2(test_spillbuf_basic_spill_all,
+                   "basic spill buffer test (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_callback, "spill buffer read callback"),
+    SVN_TEST_PASS2(test_spillbuf_callback_spill_all,
+                   "spill buffer read callback (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_file, "spill buffer file test"),
+    SVN_TEST_PASS2(test_spillbuf_file_spill_all,
+                   "spill buffer file test (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_interleaving,
                    "interleaving reads and writes"),
+    SVN_TEST_PASS2(test_spillbuf_interleaving_spill_all,
+                   "interleaving reads and writes (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_reader, "spill buffer reader test"),
+    SVN_TEST_PASS2(test_spillbuf_reader_spill_all,
+                   "spill buffer reader test (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_stream, "spill buffer stream test"),
+    SVN_TEST_PASS2(test_spillbuf_stream_spill_all,
+                   "spill buffer stream test (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_rwfile, "read/write spill file"),
+    SVN_TEST_PASS2(test_spillbuf_rwfile_spill_all,
+                   "read/write spill file (spill-all-data)"),
     SVN_TEST_PASS2(test_spillbuf_eof, "validate reaching EOF of spill file"),
+    SVN_TEST_PASS2(test_spillbuf_eof_spill_all,
+                   "validate reaching EOF (spill-all-data)"),
+    SVN_TEST_PASS2(test_spillbuf_file_attrs, "check spill file properties"),
+    SVN_TEST_PASS2(test_spillbuf_file_attrs_spill_all,
+                   "check spill file properties (spill-all-data)"),
     SVN_TEST_NULL
   };

Modified: subversion/branches/fsx/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_subr/string-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_subr/string-test.c Thu Aug  1 14:22:03 2013
@@ -812,7 +812,7 @@ test_string_matching(apr_pool_t *pool)
     {
       apr_size_t a_len = strlen(test->a);
       apr_size_t b_len = strlen(test->b);
-      apr_size_t max_match = MAX(a_len, b_len);
+      apr_size_t max_match = MIN(a_len, b_len);
       apr_size_t match_len
         = svn_cstring__match_length(test->a, test->b, max_match);
       apr_size_t rmatch_len

Modified: subversion/branches/fsx/subversion/tests/libsvn_subr/subst_translate-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_subr/subst_translate-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_subr/subst_translate-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_subr/subst_translate-test.c Thu Aug  1 14:22:03 2013
@@ -27,6 +27,7 @@
 
 #include "../svn_test.h"
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_string.h"
 #include "svn_subst.h"

Modified: subversion/branches/fsx/subversion/tests/libsvn_wc/conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_wc/conflict-data-test.c Thu Aug  1 14:22:03 2013
@@ -28,6 +28,7 @@
 #include <apr_hash.h>
 #include <apr_tables.h>
 
+#include "svn_private_config.h"
 #include "svn_props.h"
 #include "svn_pools.h"
 #include "svn_hash.h"

Modified: subversion/branches/fsx/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_wc/op-depth-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_wc/op-depth-test.c Thu Aug  1 14:22:03 2013
@@ -27,6 +27,7 @@
 #include <apr_pools.h>
 #include <apr_general.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_io.h"
 #include "svn_dirent_uri.h"

Modified: subversion/branches/fsx/subversion/tests/libsvn_wc/wc-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/libsvn_wc/wc-test.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/libsvn_wc/wc-test.c (original)
+++ subversion/branches/fsx/subversion/tests/libsvn_wc/wc-test.c Thu Aug  1 14:22:03 2013
@@ -24,6 +24,7 @@
 #include <apr_pools.h>
 #include <apr_general.h>
 
+#include "svn_private_config.h"
 #include "svn_types.h"
 #include "svn_io.h"
 #include "svn_dirent_uri.h"

Modified: subversion/branches/fsx/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/tests/svn_test_fs.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/tests/svn_test_fs.c (original)
+++ subversion/branches/fsx/subversion/tests/svn_test_fs.c Thu Aug  1 14:22:03 2013
@@ -26,6 +26,7 @@
 
 #include "svn_test.h"
 
+#include "svn_private_config.h"
 #include "svn_string.h"
 #include "svn_utf.h"
 #include "svn_pools.h"

Modified: subversion/branches/fsx/tools/dev/fsfs-reorg.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/tools/dev/fsfs-reorg.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/tools/dev/fsfs-reorg.c (original)
+++ subversion/branches/fsx/tools/dev/fsfs-reorg.c Thu Aug  1 14:22:03 2013
@@ -29,6 +29,7 @@
 #include <apr_file_io.h>
 #include <apr_poll.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_diff.h"
 #include "svn_io.h"

Modified: subversion/branches/fsx/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/tools/dist/backport.pl?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/tools/dist/backport.pl (original)
+++ subversion/branches/fsx/tools/dist/backport.pl Thu Aug  1 14:22:03 2013
@@ -139,9 +139,11 @@ sub prompt {
   print $_[0]; shift;
   my %args = @_;
   my $getchar = sub {
+    my $answer;
     ReadMode 'cbreak';
-    my $answer = (ReadKey 0);
+    eval { $answer = (ReadKey 0) };
     ReadMode 'normal';
+    die $@ if $@;
     print $answer;
     return $answer;
   };
@@ -482,6 +484,7 @@ sub revert {
   system "$SVN revert -R ./" . ($YES && $MAY_COMMIT ne 'true'
                              ? " -q" : "");
   move "$STATUS.$$.tmp", $STATUS;
+  $MERGED_SOMETHING = 0;
 }
 
 sub maybe_revert {
@@ -492,6 +495,17 @@ sub maybe_revert {
   (@_ ? exit : return);
 }
 
+sub signal_handler {
+  my $sig = shift;
+
+  # Clean up after prompt()
+  ReadMode 'normal';
+
+  # Fall back to default action
+  delete $SIG{$sig};
+  kill $sig, $$;
+}
+
 sub warning_summary {
   return unless %ERRORS;
 
@@ -626,7 +640,7 @@ sub handle_entry {
       }
       when (/^l/i) {
         if ($entry{branch}) {
-            system "$SVN log --stop-on-copy -v -r 0:HEAD -- "
+            system "$SVN log --stop-on-copy -v -g -r 0:HEAD -- "
                    ."$BRANCHES/$entry{branch} "
                    ."| $PAGER";
         } elsif (@{$entry{revisions}}) {
@@ -715,6 +729,7 @@ sub main {
   }
 
   $SIG{INT} = \&maybe_revert unless $YES;
+  $SIG{TERM} = \&signal_handler unless $YES;
 
   my $in_approved = 0;
   while (<STATUS>) {

Modified: subversion/branches/fsx/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/tools/server-side/fsfs-stats.c?rev=1509247&r1=1509246&r2=1509247&view=diff
==============================================================================
--- subversion/branches/fsx/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/fsx/tools/server-side/fsfs-stats.c Thu Aug  1 14:22:03 2013
@@ -28,6 +28,7 @@
 #include <apr_file_io.h>
 #include <apr_poll.h>
 
+#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_diff.h"
 #include "svn_io.h"



Mime
View raw message