Modified: subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/op-depth-test.c?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/op-depth-test.c Sat Feb 14 11:15:05 2015 @@ -509,7 +509,8 @@ check_db_conflicts(svn_test__sandbox_t * local_abspath = svn_dirent_join(b->wc_abspath, info->local_relpath, iterpool); - SVN_ERR(svn_wc__db_read_conflict(&conflict, b->wc_ctx->db, local_abspath, + SVN_ERR(svn_wc__db_read_conflict(&conflict, NULL, + b->wc_ctx->db, local_abspath, iterpool, iterpool)); SVN_TEST_ASSERT(conflict != NULL); @@ -5928,7 +5929,7 @@ check_tree_conflict_repos_path(svn_test_ const apr_array_header_t *locations; svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; - SVN_ERR(svn_wc__db_read_conflict(&conflict, b->wc_ctx->db, + SVN_ERR(svn_wc__db_read_conflict(&conflict, NULL, b->wc_ctx->db, sbox_wc_path(b, wc_path), b->pool, b->pool)); @@ -9140,15 +9141,15 @@ move_twice_within_delete(const svn_test_ nodes_row_t nodes[] = { { 0, "", "normal", 1, "" }, - + { 0, "A", "normal", 1, "A" }, { 0, "A/A", "normal", 1, "A/A" }, { 0, "A/A/A", "normal", 1, "A/A/A" }, - + { 1, "A", "base-deleted", NO_COPY_FROM, "B/A" }, { 1, "A/A", "base-deleted", NO_COPY_FROM }, { 1, "A/A/A", "base-deleted", NO_COPY_FROM }, - + { 1, "AA", "normal", 1, "A/A/A", MOVED_HERE }, { 1, "B", "normal", NO_COPY_FROM }, @@ -10911,6 +10912,75 @@ move_edit_obstruction(const svn_test_opt return SVN_NO_ERROR; } +static svn_error_t * +move_deep_bump(const svn_test_opts_t *opts, apr_pool_t *pool) +{ + svn_test__sandbox_t b; + + SVN_ERR(svn_test__sandbox_create(&b, "move_deep_bump", opts, pool)); + + SVN_ERR(sbox_wc_mkdir(&b, "B")); + SVN_ERR(sbox_wc_mkdir(&b, "B/B")); + SVN_ERR(sbox_wc_mkdir(&b, "B/B/A")); + SVN_ERR(sbox_wc_mkdir(&b, "B/B/A/A")); + SVN_ERR(sbox_wc_mkdir(&b, "B/B/A/A/A")); + SVN_ERR(sbox_wc_mkdir(&b, "C")); + SVN_ERR(sbox_wc_mkdir(&b, "C/C")); + SVN_ERR(sbox_wc_commit(&b, "")); + SVN_ERR(sbox_wc_mkdir(&b, "Z")); + SVN_ERR(sbox_wc_commit(&b, "")); + SVN_ERR(sbox_wc_mkdir(&b, "B/B/A/A/A/A")); + SVN_ERR(sbox_wc_commit(&b, "")); + SVN_ERR(sbox_wc_update(&b, "", 1)); + + SVN_ERR(sbox_wc_move(&b, "B/B/A", "B/B/B")); + SVN_ERR(sbox_wc_move(&b, "B/B/B/A", "C/C/A")); + + /* This can't bump C/C/A as that is outside the lock range + so we expect a tree conflict. + + This used to cause a node not found during bumping + because B/B/B/A doesn't have a BASE node */ + SVN_ERR(sbox_wc_update(&b, "B/B", 2)); + + { + nodes_row_t nodes[] = { + {0, "", "normal", 1, ""}, + {0, "B", "normal", 1, "B"}, + {0, "B/B", "normal", 2, "B/B"}, + {0, "B/B/A", "normal", 2, "B/B/A"}, + {0, "B/B/A/A", "normal", 2, "B/B/A/A"}, + {0, "B/B/A/A/A", "normal", 2, "B/B/A/A/A"}, + {0, "C", "normal", 1, "C"}, + {0, "C/C", "normal", 1, "C/C"}, + {3, "B/B/A", "base-deleted", NO_COPY_FROM, "B/B/B"}, + {3, "B/B/A/A", "base-deleted", NO_COPY_FROM}, + {3, "B/B/A/A/A", "base-deleted", NO_COPY_FROM}, + {3, "B/B/B", "normal", 2, "B/B/A", MOVED_HERE}, + {3, "B/B/B/A", "normal", 2, "B/B/A/A", MOVED_HERE}, + {3, "B/B/B/A/A", "normal", 2, "B/B/A/A/A", MOVED_HERE}, + {3, "C/C/A", "normal", 1, "B/B/A/A", MOVED_HERE}, + {3, "C/C/A/A", "normal", 1, "B/B/A/A/A", MOVED_HERE}, + {4, "B/B/B/A", "base-deleted", NO_COPY_FROM, "C/C/A"}, + {4, "B/B/B/A/A", "base-deleted", NO_COPY_FROM}, + {0} + }; + conflict_info_t conflicts[] = { + {"B/B/B/A", FALSE, FALSE, {svn_wc_conflict_action_edit, + svn_wc_conflict_reason_moved_away, "B/B/B/A"}}, + {0} + }; + + SVN_ERR(check_db_rows(&b, "", nodes)); + SVN_ERR(check_db_conflicts(&b, "", conflicts)); + } + + SVN_ERR(sbox_wc_resolve(&b, "B/B/B/A", svn_depth_empty, + svn_wc_conflict_choose_mine_conflict)); + SVN_ERR(check_db_conflicts(&b, "", NULL)); + + return SVN_NO_ERROR; +} /* ---------------------------------------------------------------------- */ /* The list of test functions */ @@ -11118,6 +11188,8 @@ static struct svn_test_descriptor_t test "move within mixed move"), SVN_TEST_OPTS_PASS(move_edit_obstruction, "move edit obstruction"), + SVN_TEST_OPTS_PASS(move_deep_bump, + "move deep bump"), SVN_TEST_NULL };
Modified: subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c (original) +++ subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c Sat Feb 14 11:15:05 2015 @@ -224,7 +224,7 @@ svn_test_add_dir_cleanup(const char *pat err = svn_mutex__lock(log_mutex); if (err) { - if (verbose_mode) + if (verbose_mode) printf("FAILED svn_mutex__lock in svn_test_add_dir_cleanup.\n"); svn_error_clear(err); return; @@ -241,7 +241,7 @@ svn_test_add_dir_cleanup(const char *pat err = svn_mutex__unlock(log_mutex, NULL); if (err) { - if (verbose_mode) + if (verbose_mode) printf("FAILED svn_mutex__unlock in svn_test_add_dir_cleanup.\n"); svn_error_clear(err); } @@ -620,7 +620,7 @@ do_tests_concurrently(const char *progna CHECK_STATUS(result, "Test thread returned an error."); } - + return params.got_error != FALSE; } Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh Sat Feb 14 11:15:05 2015 @@ -25,7 +25,7 @@ set -x # upload file to server FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript +ftp -n www.mobsol.be < ../ftpscript rm $FILENAME echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/eh-debsarge1/$FILENAME"; Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh Sat Feb 14 11:15:05 2015 @@ -33,7 +33,7 @@ if [ $SVN_VER_MINOR -ge 9 ]; then APR=/home/bt/packages/apr-1.3.9-prefix/bin/apr-1-config APU=/home/bt/packages/apr-1.3.9-prefix/bin/apu-1-config APXS=/home/bt/packages/apr-1.3.9-prefix/bin/apxs - SERF=/home/bt/packages/apr-1.3.9-prefix + SERF=/home/bt/packages/apr-1.3.9-prefix else APR=/usr APU=/usr Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnlog.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnlog.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnlog.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-centos/svnlog.sh Sat Feb 14 11:15:05 2015 @@ -25,7 +25,7 @@ set -x # upload file to server FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript +ftp -n www.mobsol.be < ../ftpscript rm $FILENAME echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/eh-debsarge1/$FILENAME"; Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh Sat Feb 14 11:15:05 2015 @@ -23,7 +23,7 @@ # upload file to server FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript +ftp -n www.mobsol.be < ../ftpscript rm $FILENAME echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/osx10.4-gcc4.0.1-ia32/$FILENAME"; Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh Sat Feb 14 11:15:05 2015 @@ -23,7 +23,7 @@ # upload file to server FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript +ftp -n www.mobsol.be < ../ftpscript rm $FILENAME echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/osx10.4-gcc4.0.1-ia32/$FILENAME"; Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/ubuntu-x64/svnlog.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/ubuntu-x64/svnlog.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/ubuntu-x64/svnlog.sh Sat Feb 14 11:15:05 2015 @@ -25,7 +25,7 @@ set -x # upload file to server FILENAME=tests-`date +%Y%m%d%H%M`.log.tgz tar -czf $FILENAME tests.log -ftp -n www.mobsol.be < ../ftpscript +ftp -n www.mobsol.be < ../ftpscript rm $FILENAME echo "Logs of the testrun can be found here: http://www.mobsol.be/logs/eh-debsarge1/$FILENAME"; Modified: subversion/branches/remove-log-addressing/tools/client-side/svn-ssl-fingerprints.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/client-side/svn-ssl-fingerprints.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/client-side/svn-ssl-fingerprints.sh (original) +++ subversion/branches/remove-log-addressing/tools/client-side/svn-ssl-fingerprints.sh Sat Feb 14 11:15:05 2015 @@ -20,7 +20,7 @@ # # # $0 --- list the fingerprints of SSL certificates that svn has seen before. -# +# # SYNOPSIS: # $0 # $0 /path/to/.subversion Modified: subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/copy_repo.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/copy_repo.py?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/copy_repo.py (original) +++ subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/copy_repo.py Sat Feb 14 11:15:05 2015 @@ -137,7 +137,7 @@ class Repository: @classmethod def is_repository(cls, path): """ Quick check that PATH is (probably) a repository. - This is mainly to filter out aux files put next to + This is mainly to filter out aux files put next to (not inside) the repositories to copy. """ format_path = os.path.join(path, 'db', 'format') Modified: subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/win_repo_bench.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/win_repo_bench.py?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/win_repo_bench.py (original) +++ subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/win_repo_bench.py Sat Feb 14 11:15:05 2015 @@ -115,7 +115,7 @@ def run_cs_command(state, config, reposi # Display the operation repo_title = repository.replace('nonpacked', 'nopack') - print state, "\t", repo_title, "\t", prefix, "\t", config, "\t", + print state, "\t", repo_title, "\t", prefix, "\t", config, "\t", sys.stdout.flush() # Execute the command and show the execution times @@ -146,18 +146,18 @@ def run_test_cs_sequence(config, reposit run_cs_command("Cold", config, repository, prefix, args) stop_server(prefix) - # OS caches are quite hot now. + # OS caches are quite hot now. # Run operation from hot OS caches but cold SVN caches. start_server(prefix, config) run_cs_command("WarmOS", config, repository, prefix, args) stop_server(prefix) - # OS caches may be even hotter now. + # OS caches may be even hotter now. # Run operation from hot OS caches but cold SVN caches. start_server(prefix, config) run_cs_command("HotOS", config, repository, prefix, args) - # Keep server process and thus the warmed up SVN caches. + # Keep server process and thus the warmed up SVN caches. # Run operation from hot OS and SVN caches. run_cs_command("WrmSVN", config, repository, prefix, args) run_cs_command("HotSVN", config, repository, prefix, args) @@ -215,7 +215,7 @@ def run_admin_command(state, config, rep else: extra = [] - print state, "\t", repository, "\t", config, "\t", + print state, "\t", repository, "\t", config, "\t", sys.stdout.flush() subprocess.call(["TimeWin.exe", exe] + args + extra) Modified: subversion/branches/remove-log-addressing/tools/dev/benchmarks/large_dirs/create_bigdir.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/benchmarks/large_dirs/create_bigdir.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/benchmarks/large_dirs/create_bigdir.sh (original) +++ subversion/branches/remove-log-addressing/tools/dev/benchmarks/large_dirs/create_bigdir.sh Sat Feb 14 11:15:05 2015 @@ -29,7 +29,7 @@ SVNPATH="$('pwd')/subversion" # Comment the SVNSERVE line to use file:// instead of svn://. SVN=${SVNPATH}/svn/svn -SVNADMIN=${SVNPATH}/svnadmin/svnadmin +SVNADMIN=${SVNPATH}/svnadmin/svnadmin SVNSERVE=${SVNPATH}/svnserve/svnserve # VALGRIND="valgrind --tool=callgrind" @@ -45,7 +45,7 @@ REPOROOT=/dev/shm FILECOUNT=1 MAXCOUNT=20000 -# only 1.7 supports server-side caching and uncompressed data transfer +# only 1.7 supports server-side caching and uncompressed data transfer SERVEROPTS="-c 0 -M 400" @@ -162,7 +162,7 @@ run_svn_get() { fi } -# main loop +# main loop while [ $FILECOUNT -lt $MAXCOUNT ]; do echo "Processing $FILECOUNT files in the same folder" @@ -172,7 +172,7 @@ while [ $FILECOUNT -lt $MAXCOUNT ]; do mkdir $WC/$FILECOUNT for i in 1 $sequence; do echo "File number $i" > $WC/$FILECOUNT/$i - done + done printf "\tAdding files ... \t" run_svn add $FILECOUNT -q @@ -182,7 +182,7 @@ while [ $FILECOUNT -lt $MAXCOUNT ]; do printf "\tCommit files ... \t" run_svn_ci $FILECOUNT add - + printf "\tListing files ... \t" run_svn ls $FILECOUNT Modified: subversion/branches/remove-log-addressing/tools/dev/build-svn-deps-win.pl URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/build-svn-deps-win.pl?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/build-svn-deps-win.pl (original) +++ subversion/branches/remove-log-addressing/tools/dev/build-svn-deps-win.pl Sat Feb 14 11:15:05 2015 @@ -17,7 +17,7 @@ # under the License. # ==================================================================== # -# Script to build all the dependencies for Subversion on Windows +# Script to build all the dependencies for Subversion on Windows # It's been written for Windows 8 and Visual Studio 2012, but # it's entirely possible it will work with older versions of both. @@ -27,7 +27,7 @@ # Subversion and quickly get up a development environment. # Prerequisites: -# Perl: http://www.activestate.com/activeperl/downloads +# Perl: http://www.activestate.com/activeperl/downloads # Python: http://www.activestate.com/activepython/downloads # 7-Zip: http://www.7-zip.org/download.html # CMake: http://www.cmake.org/cmake/resources/software.html @@ -42,7 +42,7 @@ # available. # # TODO: -# Find some way to work around the lack of devenv in Express (msbuild will help some) +# Find some way to work around the lack of devenv in Express (msbuild will help some) # Include a package target that zips everything up. # Perl script that runs the Subversion get-make.py tool with the right args. # Alternatively update gen-make.py with an arg that knows about our layout. @@ -54,7 +54,7 @@ # Allow selection of Arch (x86 and x64) # ZLib support for OpenSSL (have to patch openssl) # Use CMake zlib build instead. -# Assembler support for OpenSSL. +# Assembler support for OpenSSL. # Add more specific commands to the command line (e.g. build-httpd) ################################### @@ -208,10 +208,10 @@ my $PERL = $Config{perlpath}; # Directory constants that we setup for convenience, but that # shouldn't be changed since they are assumed in the build systems -# of the various dependencies. +# of the various dependencies. my $HTTPD; # Where httpd gets built my $BDB; # Where bdb gets built -my $BINDIR; # where binaries are installed +my $BINDIR; # where binaries are installed my $LIBDIR; # where libraries are installed my $INCDIR; # where headers are installed my $SRCLIB; # httpd's srclib dir @@ -274,7 +274,7 @@ sub system_or_die { } # Like perl -pi.orig the second arg is a reference to a -# function that does whatever line processing you want. +# function that does whatever line processing you want. # Note that $_ is used for the input and output of the # function. So modifying $_ changes the line in the file. # bak can be passed to set the backup extension. If the @@ -345,7 +345,7 @@ sub prepare_structure { sub clean_structure { # ignore errors in this function the paths may not exist my $real_clean = shift; - + if ($real_clean) { rmtree($SRCDIR); } @@ -478,7 +478,7 @@ sub extract_dependencies { extract_file($API_FILE, $SRCLIB, "$SRCLIB\\apr-iconv-$API_VER", "$SRCLIB\\apr-iconv"); # We fix the line endings before putting the non-Apache deps in place since it - # touches everything under httpd and there's no point in doing other things. + # touches everything under httpd and there's no point in doing other things. httpd_fix_lineends(); extract_file($ZLIB_FILE, $SRCLIB, "$SRCLIB\\zlib-$ZLIB_VER", "$SRCLIB\\zlib"); @@ -507,7 +507,7 @@ sub build_pcre { my $pcre_options = '-DPCRE_NO_RECURSE:BOOL=ON'; my $pcre_shared_libs = '-DBUILD_SHARED_LIBS:BOOL=ON'; my $pcre_install_prefix = "-DCMAKE_INSTALL_PREFIX:PATH=$INSTDIR"; - my $cmake_cmd = qq("$CMAKE" -G "$pcre_generator" "$pcre_build_type" "$pcre_shared_libs" "$pcre_install_prefix" "$pcre_options" .); + my $cmake_cmd = qq("$CMAKE" -G "$pcre_generator" "$pcre_build_type" "$pcre_shared_libs" "$pcre_install_prefix" "$pcre_options" .); system_or_die("Failure generating pcre Makefiles", $cmake_cmd); system_or_die("Failure building pcre", qq("$NMAKE")); system_or_die("Failure testing pcre", qq("$NMAKE" test)); @@ -521,7 +521,7 @@ sub build_zlib { chdir_or_die("$SRCLIB\\zlib"); $ENV{CC_OPTS} = $DEBUG ? '/MDd /Gm /ZI /Od /GZ /D_DEBUG' : '/MD /02 /Zi'; $ENV{COMMON_CC_OPTS} = '/nologo /W3 /DWIN32 /D_WINDOWS'; - + system_or_die("Failure building zilb", qq("$NMAKE" /nologo -f win32\\Makefile.msc STATICLIB=zlibstat.lib all)); delete $ENV{CC_OPTS}; @@ -533,14 +533,14 @@ sub build_zlib { sub build_openssl { chdir_or_die("$SRCLIB\\openssl"); - # We're building openssl without an assembler. If someone wants to + # We're building openssl without an assembler. If someone wants to # use this for production they should probably download NASM and # remove the no-asm below and use ms\do_nasm.bat instead. - + # TODO: Enable openssl to use zlib. openssl needs some patching to do # this since it wants to look for zlib as zlib1.dll and as the httpd # build instructions note you probably don't want to dynamic link zlib. - + # TODO: OpenSSL requires perl on the path since it uses perl without a full # path in the batch file and the makefiles. Probably should determine # if PERL is on the path and add it here if not. @@ -599,7 +599,7 @@ sub httpd_fix_lineends { chdir_or_die($TOPDIR); } -# The httpd makefile in 2.4.4 doesn't know about .vcxproj files and +# The httpd makefile in 2.4.4 doesn't know about .vcxproj files and # still thinks it's got an older version of Visual Studio because # .vcproj files have become .vcxproj. sub httpd_fix_makefile { @@ -607,8 +607,8 @@ sub httpd_fix_makefile { modify_file_in_place($file, sub { s/\.vcproj/.vcxproj/i; - # below fixes that installd breaks when trying to install pcre because - # dll is named pcred.dll when a Debug build. + # below fixes that installd breaks when trying to install pcre because + # dll is named pcred.dll when a Debug build. s/^(\s*copy srclib\\pcre\\pcre\.\$\(src_dll\)\s+"\$\(inst_dll\)"\s+<\s*\.y\s*)$/!IF EXISTS("srclib\\pcre\\pcre\.\$(src_dll)")\n$1!ENDIF\n!IF EXISTS("srclib\\pcre\\pcred\.\$(src_dll)")\n\tcopy srclib\\pcre\\pcred.\$(src_dll)\t\t\t"\$(inst_dll)" <.y\n!ENDIF\n/; }); } @@ -797,8 +797,8 @@ sub build_httpd { sub build_bdb { chdir_or_die($BDB); - print(cwd(),$/); - my $sln = 'build_windows\Berkeley_DB_vs2010.sln'; + print(cwd(),$/); + my $sln = 'build_windows\Berkeley_DB_vs2010.sln'; upgrade_solution($sln); my $platform = $DEBUG ? 'Debug|Win32' : 'Release|Win32'; @@ -834,7 +834,7 @@ sub build_serf { s/^(INTDIR = Debug)$/$1\nOPENSSL_OUT_SUFFIX = .dbg/; s/(\$\(OPENSSL_SRC\)\\out32(?:dll)?)/$1\$(OPENSSL_OUT_SUFFIX)/g; }, '.debug'); - + chdir_or_die($TOPDIR); } Modified: subversion/branches/remove-log-addressing/tools/dev/fsfs-access-map.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/fsfs-access-map.c?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/fsfs-access-map.c (original) +++ subversion/branches/remove-log-addressing/tools/dev/fsfs-access-map.c Sat Feb 14 11:15:05 2015 @@ -60,7 +60,7 @@ typedef struct file_stats_t /* number of read() calls that returned 0 bytes */ apr_int64_t empty_reads; - + /* total number of bytes returned by those reads */ apr_int64_t read_size; @@ -314,7 +314,7 @@ parse_line(svn_stringbuf_t *line) else while(*func_start == ' ') func_start++; - + first_param_end = strchr(func_end, ','); if (first_param_end == NULL) first_param_end = strchr(func_end, ')'); @@ -558,13 +558,13 @@ scale_line(color_t* out, int in_len) { double scaling_factor = (double)(in_len) / (double)(out_len); - + apr_size_t i; memset(out, 0, out_len * sizeof(color_t)); for (i = 0; i < out_len; ++i) { color_t color = { 0 }; - + double source_start = i * scaling_factor; double source_end = (i + 1) * scaling_factor; @@ -626,7 +626,7 @@ write_bitmap(apr_array_header_t *info, /**/ line = apr_pcalloc(pool, xsize * sizeof(color_t)); scaled_line = apr_pcalloc(pool, row_size); - + /* write header to file */ write_bitmap_header(file, max_x, ysize); Modified: subversion/branches/remove-log-addressing/tools/dev/po-merge.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/po-merge.py?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/po-merge.py (original) +++ subversion/branches/remove-log-addressing/tools/dev/po-merge.py Sat Feb 14 11:15:05 2015 @@ -188,7 +188,7 @@ def main(argv): # We're done. Tell the user what we did. print(('%d strings updated. ' - '%d fuzzy strings. ' + '%d fuzzy strings. ' '%d of %d strings are still untranslated (%.0f%%).' % (update_count, fuzzy, untranslated, string_count, 100.0 * untranslated / string_count))) Modified: subversion/branches/remove-log-addressing/tools/dev/remove-trailing-whitespace.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/remove-trailing-whitespace.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/remove-trailing-whitespace.sh (original) +++ subversion/branches/remove-log-addressing/tools/dev/remove-trailing-whitespace.sh Sat Feb 14 11:15:05 2015 @@ -17,8 +17,8 @@ # specific language governing permissions and limitations # under the License. - for ext in c h cpp java py pl rb hpp cmd bat; do - find . -name "*.$ext" -exec \ + for ext in c h cpp java py pl rb hpp cmd bat sql sh; do + find . -name "*.$ext" -not -type l -exec \ perl -pi -e 's/[ \t]*$//' {} + ; # don't use \s to not strip ^L pagebreaks - done + done Modified: subversion/branches/remove-log-addressing/tools/dev/x509-parser.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/x509-parser.c?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/x509-parser.c (original) +++ subversion/branches/remove-log-addressing/tools/dev/x509-parser.c Sat Feb 14 11:15:05 2015 @@ -84,7 +84,7 @@ is_der_cert(const svn_string_t *raw) { /* really simplistic fingerprinting of a DER. By definition it must * start with an ASN.1 tag of a constructed (0x20) sequence (0x10). - * It's somewhat unfortunate that 0x30 happens to also come out to the + * It's somewhat unfortunate that 0x30 happens to also come out to the * ASCII for '0' which may mean this will create false positives. */ return raw->data[0] == 0x30 ? TRUE : FALSE; } Modified: subversion/branches/remove-log-addressing/tools/diff/diff.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/diff/diff.c?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/diff/diff.c (original) +++ subversion/branches/remove-log-addressing/tools/diff/diff.c Sat Feb 14 11:15:05 2015 @@ -117,7 +117,7 @@ int main(int argc, const char *argv[]) APR_ARRAY_PUSH(options_array, const char *) = argv[i]; - /* Special case: '-U' takes an argument, so capture the + /* Special case: '-U' takes an argument, so capture the * next argument in the array. */ if (argv[i][1] == 'U' && !argv[i][2]) { Modified: subversion/branches/remove-log-addressing/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dist/backport.pl?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dist/backport.pl (original) +++ subversion/branches/remove-log-addressing/tools/dist/backport.pl Sat Feb 14 11:15:05 2015 @@ -63,7 +63,7 @@ my @sh = qw/false true/; die if grep { ($sh[$_] eq 'true') != !!$_ } $DEBUG, $MAY_COMMIT, $VERBOSE, $YES; # Username for entering votes. -my $SVN_A_O_REALM = '<https://svn.apache.org:443> ASF Committers'; +my $SVN_A_O_REALM = '<https://svn.apache.org:443> ASF Committers'; my ($AVAILID) = $ENV{AVAILID} // do { local $_ = `$SVN auth svn.apache.org:443 2>/dev/null`; # TODO: pass $SVN_A_O_REALM ($? == 0 && /Auth.*realm: \Q$SVN_A_O_REALM\E\nUsername: (.*)/) ? $1 : undef @@ -288,7 +288,7 @@ sub shell_safe_path_or_url($) { local $_ = shift; return m{^[A-Za-z0-9._:+/-]+$} and !/^-|^[+]/; } - + # Shell-safety-validating wrapper for File::Temp::tempfile sub my_tempfile { my ($fh, $fn) = tempfile(); @@ -502,8 +502,8 @@ sub parse_entry { $notes .= shift while @_ and $_[0] !~ /^\w/; my %accepts = map { $_ => 1 } ($notes =~ /--accept[ =]([a-z-]+)/g); given (scalar keys %accepts) { - when (0) { } - when (1) { $accept = [keys %accepts]->[0]; } + when (0) { } + when (1) { $accept = [keys %accepts]->[0]; } default { warn "Too many --accept values at '", logsummarysummary({ logsummary => [@logsummary] }), @@ -625,7 +625,7 @@ sub vote { (exists $approved->{$key}) ? ($raw_approved .= $_) : (print VOTES); next; } - + s/^(\s*\Q$vote\E:.*)/"$1, $AVAILID"/me or s/(.*\w.*?\n)/"$1 $vote: $AVAILID\n"/se; $_ = edit_string $_, $entry->{header}, trailing_eol => 2 @@ -648,7 +648,7 @@ sub vote { grep { !$approvedcheck{$_} } keys %$approved if scalar(keys %$approved) != scalar(keys %approvedcheck); prompt "Press the 'any' key to continue...\n", dontprint => 1 - if scalar(keys %$approved) != scalar(keys %approvedcheck) + if scalar(keys %$approved) != scalar(keys %approvedcheck) or scalar(keys %$votes) != scalar(keys %votescheck); move "$STATUS.$$.tmp", $STATUS; @@ -893,7 +893,7 @@ sub handle_entry { verbose => 1, extra => qr/[+-]/) { when (/^y/i) { merge %entry; - while (1) { + while (1) { given (prompt "Shall I open a subshell? [ydN] ", verbose => 1) { when (/^y/i) { # TODO: if $MAY_COMMIT, save the log message to a file (say, @@ -1091,7 +1091,7 @@ sub nominate_main { # Construct entry. my $logmsg = `$SVN propget --revprop -r $revnums[0] --strict svn:log '^/'`; die "Can't fetch log message of r$revnums[0]: $!" unless $logmsg; - + unless ($logmsg =~ s/^(.*?)\n\n.*/$1/s) { # "* file\n (symbol): Log message." Propchange: subversion/branches/remove-log-addressing/tools/dist/backport_tests.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/remove-log-addressing/tools/dist/dist.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dist/dist.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dist/dist.sh (original) +++ subversion/branches/remove-log-addressing/tools/dist/dist.sh Sat Feb 14 11:15:05 2015 @@ -22,7 +22,7 @@ # USAGE: ./dist.sh -v VERSION -r REVISION -pr REPOS-PATH # [-alpha ALPHA_NUM|-beta BETA_NUM|-rc RC_NUM|pre PRE_NUM] -# [-apr PATH-TO-APR ] [-apru PATH-TO-APR-UTIL] +# [-apr PATH-TO-APR ] [-apru PATH-TO-APR-UTIL] # [-apri PATH-TO-APR-ICONV] [-neon PATH-TO-NEON] # [-serf PATH-TO-SERF] [-zlib PATH-TO-ZLIB] # [-sqlite PATH-TO-SQLITE] [-zip] [-sign] @@ -47,13 +47,13 @@ # working copy, so you may wish to create a dist-resources directory # containing the apr/, apr-util/, neon/, serf/, zlib/ and sqlite/ # dependencies, and run dist.sh from that. -# +# # When building alpha, beta or rc tarballs pass the appropriate flag # followed by a number. For example "-alpha 5", "-beta 3", "-rc 2". -# +# # If neither an -alpha, -beta, -pre or -rc option is specified, a release # tarball will be built. -# +# # To build a Windows zip file package, additionally pass -zip and the # path to apr-iconv with -apri. @@ -119,7 +119,7 @@ if [ -n "$ALPHA" ] && [ -n "$BETA" ] && exit 1 elif [ -n "$ALPHA" ] ; then VER_TAG="Alpha $ALPHA" - VER_NUMTAG="-alpha$ALPHA" + VER_NUMTAG="-alpha$ALPHA" elif [ -n "$BETA" ] ; then VER_TAG="Beta $BETA" VER_NUMTAG="-beta$BETA" Modified: subversion/branches/remove-log-addressing/tools/dist/nightly.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dist/nightly.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dist/nightly.sh (original) +++ subversion/branches/remove-log-addressing/tools/dist/nightly.sh Sat Feb 14 11:15:05 2015 @@ -54,7 +54,7 @@ head=`$svn info $repo/trunk | grep '^Rev # Get the latest versions of the rolling scripts for i in release.py dist.sh -do +do $svn export --force -r $head $repo/trunk/tools/dist/$i@$head $dir/$i done # We also need ezt Propchange: subversion/branches/remove-log-addressing/tools/hook-scripts/control-chars.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/mailer.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/mailer.py?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/mailer.py (original) +++ subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/mailer.py Sat Feb 14 11:15:05 2015 @@ -241,7 +241,7 @@ class MailedOutput(OutputBase): # characters), encoding (per RFC2047) each token as necessary, and # slapping 'em back to together again. from email.Header import Header - + def _maybe_encode_header(hdr_token): try: hdr_token.encode('ascii') Modified: subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/tests/mailer-init.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/tests/mailer-init.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/tests/mailer-init.sh (original) +++ subversion/branches/remove-log-addressing/tools/hook-scripts/mailer/tests/mailer-init.sh Sat Feb 14 11:15:05 2015 @@ -104,12 +104,12 @@ svn commit -m "copy dir, then make a cha printf "\x00\x01\x02\x03\x04\n" > file11 svn add file11 svn ps svn:mime-type application/octect-stream file11 -svn ps prop2 -F file11 file9 +svn ps prop2 -F file11 file9 svn commit -m "add binary file" # change the binary file and set property to non binary value printf "\x20\x01\x02\x20\n" > file11 -svn ps prop2 propval2 file9 +svn ps prop2 propval2 file9 svn commit -m "change binary file" # tweak the commit dates to known quantities Propchange: subversion/branches/remove-log-addressing/tools/hook-scripts/validate-files.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/remove-log-addressing/tools/po/po-update.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/po/po-update.sh?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/po/po-update.sh (original) +++ subversion/branches/remove-log-addressing/tools/po/po-update.sh Sat Feb 14 11:15:05 2015 @@ -93,8 +93,8 @@ update_po() # GNU gettext-tools 0.14.6 implementation) inverts the order of obsolete # messages every time it is run. Therefore, run it twice, to invert and # then re-invert, to minimize spurious diffs. - $MSGMERGE --sort-by-file --no-wrap --update $i subversion.pot - $MSGMERGE --sort-by-file --no-wrap --update $i subversion.pot + $MSGMERGE --sort-by-file --no-wrap --update $i subversion.pot + $MSGMERGE --sort-by-file --no-wrap --update $i subversion.pot done ) } Modified: subversion/branches/remove-log-addressing/tools/server-side/svnpubsub/daemonize.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/server-side/svnpubsub/daemonize.py?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/server-side/svnpubsub/daemonize.py (original) +++ subversion/branches/remove-log-addressing/tools/server-side/svnpubsub/daemonize.py Sat Feb 14 11:15:05 2015 @@ -83,7 +83,7 @@ class Daemon(object): p = multiprocessing.Process(target=self._first_child, args=(child_is_ready, child_completed)) p.start() - + # Wait for the child to finish setting things up (in case we need # to communicate with it). It will only exit when ready. ### use a timeout here! (parameterized, of course) @@ -260,13 +260,13 @@ class _Detacher(Daemon): def run(self): self.target(*self.args, **self.kwargs) - + def run_detached(target, *args, **kwargs): """Simple function to run TARGET as a detached daemon. - + The additional arguments/keywords will be passed along. This function does not return -- sys.exit() will be called as appropriate. - + (capture SystemExit if logging/reporting is necessary) ### if needed, a variant of this func could be written to not exit """ Propchange: subversion/branches/remove-log-addressing/tools/server-side/svnpubsub/svnpubsub/util.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/remove-log-addressing/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/win-tests.py?rev=1659777&r1=1659776&r2=1659777&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/win-tests.py (original) +++ subversion/branches/remove-log-addressing/win-tests.py Sat Feb 14 11:15:05 2015 @@ -212,7 +212,7 @@ for opt, val in opts: test_javahl = 1 elif opt == '--swig': if val not in ['perl', 'python', 'ruby']: - sys.stderr.write('Running \'%s\' swig tests not supported (yet).\n' + sys.stderr.write('Running \'%s\' swig tests not supported (yet).\n' % (val,)) test_swig = val elif opt == '--list': @@ -257,7 +257,7 @@ if fs_type == 'bdb': all_tests = gen_obj.test_progs + gen_obj.bdb_test_progs \ + gen_obj.scripts + gen_obj.bdb_scripts else: - all_tests = gen_obj.test_progs + gen_obj.scripts + all_tests = gen_obj.test_progs + gen_obj.scripts client_tests = [x for x in all_tests if x.startswith(CMDLINE_TEST_SCRIPT_PATH)] @@ -323,14 +323,14 @@ def locate_libs(): "Move DLLs to a known location and set env vars" debug = (objdir == 'Debug') - + for lib in gen_obj._libraries.values(): if debug: name, dir = lib.debug_dll_name, lib.debug_dll_dir else: name, dir = lib.dll_name, lib.dll_dir - + if name and dir: src = os.path.join(dir, name) if os.path.exists(src): @@ -799,7 +799,7 @@ elif test_javahl: '-Dtest.rooturl=', '-Dtest.fstype=' + fs_type , '-Dtest.tests=', - + '-Djava.library.path=' + os.path.join(abs_objdir, 'subversion/bindings/javahl/native'),
