Modified: subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c (original) +++ subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c Mon Jun 11 08:06:26 2012 @@ -10076,7 +10076,7 @@ scan_addition_txn(void *baton, /* ### This loop here is to skip up to the first node which is a BASE node, - because base_get_info() doesn't accomodate the scenario that + because base_get_info() doesn't accommodate the scenario that we're looking at here; we found the true op_root, which may be inside further changed trees. */ while (TRUE)
Modified: subversion/branches/ev2-export/subversion/mod_dav_svn/reports/update.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/mod_dav_svn/reports/update.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/mod_dav_svn/reports/update.c (original) +++ subversion/branches/ev2-export/subversion/mod_dav_svn/reports/update.c Mon Jun 11 08:06:26 2012 @@ -582,10 +582,10 @@ upd_add_directory(const char *path, static svn_error_t * upd_open_directory(const char *path, - void *parent_baton, - svn_revnum_t base_revision, - apr_pool_t *pool, - void **child_baton) + void *parent_baton, + svn_revnum_t base_revision, + apr_pool_t *pool, + void **child_baton) { return open_helper(TRUE /* is_dir */, path, parent_baton, base_revision, pool, child_baton); Modified: subversion/branches/ev2-export/subversion/tests/cmdline/davautocheck.sh URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/cmdline/davautocheck.sh?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/cmdline/davautocheck.sh (original) +++ subversion/branches/ev2-export/subversion/tests/cmdline/davautocheck.sh Mon Jun 11 08:06:26 2012 @@ -67,6 +67,8 @@ # # To prevent the server from advertising httpv2, pass USE_HTTPV1 in # the environment. +# +# To enable "SVNCacheRevProps on" set CACHE_REVPROPS in the environment. # # To use value for "SVNPathAuthz" directive set SVN_PATH_AUTHZ with # appropriate value in the environment. @@ -186,6 +188,11 @@ if [ ${SVN_PATH_AUTHZ:+set} ]; then SVN_PATH_AUTHZ_LINE="SVNPathAuthz ${SVN_PATH_AUTHZ}" fi +CACHE_REVPROPS_SETTING=off +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) @@ -380,6 +387,7 @@ CustomLog "$HTTPD_ROOT/ops" "% AuthUserFile $HTTPD_USERS Require valid-user SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL} + SVNCacheRevProps ${CACHE_REVPROPS_SETTING} ${SVN_PATH_AUTHZ_LINE} </Location> <Location /svn-test-work/local_tmp/repos> Modified: subversion/branches/ev2-export/subversion/tests/cmdline/svnserveautocheck.sh URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/cmdline/svnserveautocheck.sh?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/cmdline/svnserveautocheck.sh (original) +++ subversion/branches/ev2-export/subversion/tests/cmdline/svnserveautocheck.sh Mon Jun 11 08:06:26 2012 @@ -103,6 +103,10 @@ if [ "$THREADED" != "" ]; then SVNSERVE_ARGS="-T" fi +if [ ${CACHE_REVPROPS:+set} ]; then + SVNSERVE_ARGS="$SVNSERVE_ARGS --cache-revprops on" +fi + "$SERVER_CMD" -d -r "$ABS_BUILDDIR/subversion/tests/cmdline" \ --listen-host 127.0.0.1 \ --listen-port $SVNSERVE_PORT \ Modified: subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c Mon Jun 11 08:06:26 2012 @@ -336,10 +336,11 @@ random_test(apr_pool_t *pool) delta_pool); /* Make stage 1: create the text delta. */ - svn_txdelta(&txdelta_stream, - svn_stream_from_aprfile(source, delta_pool), - svn_stream_from_aprfile(target, delta_pool), - delta_pool); + svn_txdelta2(&txdelta_stream, + svn_stream_from_aprfile(source, delta_pool), + svn_stream_from_aprfile(target, delta_pool), + FALSE, + delta_pool); SVN_ERR(svn_txdelta_send_txstream(txdelta_stream, handler, @@ -421,15 +422,17 @@ do_random_combine_test(apr_pool_t *pool, /* Make stage 1: create the text deltas. */ - svn_txdelta(&txdelta_stream_A, - svn_stream_from_aprfile(source, delta_pool), - svn_stream_from_aprfile(middle, delta_pool), - delta_pool); - - svn_txdelta(&txdelta_stream_B, - svn_stream_from_aprfile(middle_copy, delta_pool), - svn_stream_from_aprfile(target, delta_pool), - delta_pool); + svn_txdelta2(&txdelta_stream_A, + svn_stream_from_aprfile(source, delta_pool), + svn_stream_from_aprfile(middle, delta_pool), + FALSE, + delta_pool); + + svn_txdelta2(&txdelta_stream_B, + svn_stream_from_aprfile(middle_copy, delta_pool), + svn_stream_from_aprfile(target, delta_pool), + FALSE, + delta_pool); { svn_txdelta_window_t *window_A; Modified: subversion/branches/ev2-export/subversion/tests/libsvn_delta/svndiff-test.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_delta/svndiff-test.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_delta/svndiff-test.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_delta/svndiff-test.c Mon Jun 11 08:06:26 2012 @@ -75,10 +75,11 @@ main(int argc, char **argv) if (argc == 4) version = atoi(argv[3]); - svn_txdelta(&txdelta_stream, - svn_stream_from_aprfile(source_file, pool), - svn_stream_from_aprfile(target_file, pool), - pool); + svn_txdelta2(&txdelta_stream, + svn_stream_from_aprfile(source_file, pool), + svn_stream_from_aprfile(target_file, pool), + FALSE, + pool); err = svn_stream_for_stdout(&stdout_stream, pool); if (err) Modified: subversion/branches/ev2-export/subversion/tests/libsvn_delta/vdelta-test.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_delta/vdelta-test.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_delta/vdelta-test.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_delta/vdelta-test.c Mon Jun 11 08:06:26 2012 @@ -28,6 +28,7 @@ #include "../svn_test.h" +#include "svn_ctype.h" #include "svn_delta.h" #include "svn_error.h" #include "svn_pools.h" @@ -59,10 +60,11 @@ do_one_diff(apr_file_t *source_file, apr *count = 0; *len = 0; - svn_txdelta(&delta_stream, - svn_stream_from_aprfile(source_file, fpool), - svn_stream_from_aprfile(target_file, fpool), - fpool); + svn_txdelta2(&delta_stream, + svn_stream_from_aprfile(source_file, fpool), + svn_stream_from_aprfile(target_file, fpool), + FALSE, + fpool); do { svn_error_t *err; err = svn_txdelta_next_window(&delta_window, delta_stream, wpool); @@ -82,75 +84,17 @@ do_one_diff(apr_file_t *source_file, apr } -static apr_file_t * -open_binary_read(const char *path, apr_pool_t *pool) -{ - apr_status_t apr_err; - apr_file_t *fp; - - apr_err = apr_file_open(&fp, path, (APR_READ | APR_BINARY), - APR_OS_DEFAULT, pool); - - if (apr_err) - { - fprintf(stderr, "unable to open \"%s\" for reading\n", path); - exit(1); - } - - return fp; -} - - -int -main(int argc, char **argv) +static void +do_one_test_cycle(apr_file_t *source_file_A, apr_file_t *target_file_A, + apr_file_t *source_file_B, apr_file_t *target_file_B, + int quiet, apr_pool_t *pool) { - apr_file_t *source_file_A = NULL; - apr_file_t *target_file_A = NULL; int count_A = 0; apr_off_t len_A = 0; - apr_file_t *source_file_B = NULL; - apr_file_t *target_file_B = NULL; int count_B = 0; apr_off_t len_B = 0; - apr_pool_t *pool; - int quiet = 0; - - if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'q') - { - quiet = 1; - --argc; ++argv; - } - - apr_initialize(); - pool = svn_pool_create(NULL); - - if (argc == 2) - { - target_file_A = open_binary_read(argv[1], pool); - } - else if (argc == 3) - { - source_file_A = open_binary_read(argv[1], pool); - target_file_A = open_binary_read(argv[2], pool); - } - else if (argc == 4) - { - source_file_A = open_binary_read(argv[1], pool); - target_file_A = open_binary_read(argv[2], pool); - source_file_B = open_binary_read(argv[2], pool); - target_file_B = open_binary_read(argv[3], pool); - } - else - { - fprintf(stderr, - "Usage: vdelta-test [-q] <target>\n" - " or: vdelta-test [-q] <source> <target>\n" - " or: vdelta-test [-q] <source> <intermediate> <target>\n"); - exit(1); - } - do_one_diff(source_file_A, target_file_A, &count_A, &len_A, quiet, pool, "A ", stdout); @@ -181,14 +125,16 @@ main(int argc, char **argv) apr_file_seek(target_file_B, APR_SET, &offset); } - svn_txdelta(&stream_A, - svn_stream_from_aprfile(source_file_A, fpool), - svn_stream_from_aprfile(target_file_A, fpool), - fpool); - svn_txdelta(&stream_B, - svn_stream_from_aprfile(source_file_B, fpool), - svn_stream_from_aprfile(target_file_B, fpool), - fpool); + svn_txdelta2(&stream_A, + svn_stream_from_aprfile(source_file_A, fpool), + svn_stream_from_aprfile(target_file_A, fpool), + FALSE, + fpool); + svn_txdelta2(&stream_B, + svn_stream_from_aprfile(source_file_B, fpool), + svn_stream_from_aprfile(target_file_B, fpool), + FALSE, + fpool); for (count_AB = 0; count_AB < count_B; ++count_AB) { @@ -219,6 +165,98 @@ main(int argc, char **argv) fprintf(stdout, "AB: (LENGTH %" APR_OFF_T_FMT " +%d)\n", len_AB, count_AB); } +} + + +static apr_file_t * +open_binary_read(const char *path, apr_pool_t *pool) +{ + apr_status_t apr_err; + apr_file_t *fp; + + apr_err = apr_file_open(&fp, path, (APR_READ | APR_BINARY), + APR_OS_DEFAULT, pool); + + if (apr_err) + { + fprintf(stderr, "unable to open \"%s\" for reading\n", path); + exit(1); + } + + return fp; +} + + +int +main(int argc, char **argv) +{ + apr_file_t *source_file_A = NULL; + apr_file_t *target_file_A = NULL; + + apr_file_t *source_file_B = NULL; + apr_file_t *target_file_B = NULL; + + apr_pool_t *pool; + int quiet = 0; + int repeat = 1; + + while (argc > 1) + { + const char *const arg = argv[1]; + if (arg[0] != '-') + break; + + if (arg[1] == 'q') + quiet = 1; + else if (svn_ctype_isdigit(arg[1])) + repeat = atoi(arg + 1); + else + break; + --argc; ++argv; + } + + apr_initialize(); + pool = svn_pool_create(NULL); + + if (argc == 2) + { + target_file_A = open_binary_read(argv[1], pool); + } + else if (argc == 3) + { + source_file_A = open_binary_read(argv[1], pool); + target_file_A = open_binary_read(argv[2], pool); + } + else if (argc == 4) + { + source_file_A = open_binary_read(argv[1], pool); + target_file_A = open_binary_read(argv[2], pool); + source_file_B = open_binary_read(argv[2], pool); + target_file_B = open_binary_read(argv[3], pool); + } + else + { + fprintf(stderr, + "Usage: vdelta-test [-q] [-<repeat>] <target>\n" + " or: vdelta-test [-q] [-<repeat>] <source> <target>\n" + " or: vdelta-test [-q] [-<repeat>] " + "<source> <intermediate> <target>\n"); + exit(1); + } + + while (0 < repeat--) + { + apr_off_t offset = 0; + + do_one_test_cycle(source_file_A, target_file_A, + source_file_B, target_file_B, + quiet, pool); + + if (source_file_A) apr_file_seek(source_file_A, APR_SET, &offset); + if (target_file_A) apr_file_seek(target_file_A, APR_SET, &offset); + if (source_file_B) apr_file_seek(source_file_B, APR_SET, &offset); + if (target_file_B) apr_file_seek(target_file_B, APR_SET, &offset); + } if (source_file_A) apr_file_close(source_file_A); if (target_file_A) apr_file_close(target_file_A); Modified: subversion/branches/ev2-export/subversion/tests/libsvn_delta/window-test.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_delta/window-test.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_delta/window-test.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_delta/window-test.c Mon Jun 11 08:06:26 2012 @@ -70,7 +70,7 @@ stream_window_test(apr_pool_t *pool) target_str.len = 109000; target_stream = svn_stream_from_string(&target_str, pool); - svn_txdelta(&txstream, source_stream, target_stream, pool); + svn_txdelta2(&txstream, source_stream, target_stream, TRUE, pool); while (1) { Modified: subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c Mon Jun 11 08:06:26 2012 @@ -81,17 +81,18 @@ create_repos_and_wc(const char **repos_u /* Create a WC. Set *WC_ABSPATH to its path. */ { + apr_pool_t *subpool = svn_pool_create(pool); /* To cleanup CTX */ svn_client_ctx_t *ctx; svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} }; - SVN_ERR(svn_client_create_context(&ctx, pool)); - /* SVN_ERR(svn_config_get_config(&ctx->config, config_dir, pool)); */ + SVN_ERR(svn_client_create_context(&ctx, subpool)); SVN_ERR(svn_dirent_get_absolute(wc_abspath, wc_path, pool)); SVN_ERR(svn_client_checkout3(NULL, *repos_url, *wc_abspath, &head_rev, &head_rev, svn_depth_infinity, FALSE /* ignore_externals */, FALSE /* allow_unver_obstructions */, - ctx, pool)); + ctx, subpool)); + svn_pool_destroy(subpool); } /* Register this WC for cleanup. */ Modified: subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn?rev=1348743&r1=1348742&r2=1348743&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn Mon Jun 11 08:06:26 2012 @@ -71,10 +71,10 @@ GNU_ICONV_VER = 1.14 APR_UTIL_VER = 1.4.1 HTTPD_VER = 2.2.22 NEON_VER = 0.29.6 -SERF_VER = 1.0.3 +SERF_VER = 1.1.0 SERF_OLD_VER = 0.3.1 CYRUS_SASL_VER = 2.1.25 -SQLITE_VER = 3071100 +SQLITE_VER = 3071201 LIBMAGIC_VER = 5.11 RUBY_VER = 1.8.7-p358 BZ2_VER = 1.0.6 @@ -1187,7 +1187,7 @@ ifeq ($(ENABLE_JAVA_BINDINGS),yes) JAVAHL_FLAG=--enable-javahl=yes --with-jdk --with-jikes=no \ --with-junit=$(DISTDIR)/$(JUNIT_DIST) else - JAVAHL_FLAG=--enable-javahl=no + JAVAHL_FLAG=--with-jdk=no endif ifdef PROFILE
