You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/02/16 18:40:11 UTC
svn commit: r1660173 [10/10] - in /subversion/branches/move-tracking-2: ./
build/ build/generator/ contrib/ contrib/client-side/svncopy/ notes/
subversion/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/ ...
Modified: subversion/branches/move-tracking-2/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/svn_test_main.c?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/move-tracking-2/subversion/tests/svn_test_main.c Mon Feb 16 17:40:07 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);
}
@@ -328,14 +328,18 @@ log_results(const char *progname,
if (msg_only)
{
+ const svn_boolean_t otoh = !!desc->predicate.description;
+
if (run_this_test)
- printf(" %3d %-5s %s%s%s%s\n",
+ printf(" %3d %-5s %s%s%s%s%s%s\n",
test_num,
(xfail ? "XFAIL" : (skip ? "SKIP" : "")),
msg ? msg : "(test did not provide name)",
(wimp && verbose_mode) ? " [[" : "",
(wimp && verbose_mode) ? desc->wip : "",
- (wimp && verbose_mode) ? "]]" : "");
+ (wimp && verbose_mode) ? "]]" : "",
+ (otoh ? " / " : ""),
+ (otoh ? desc->predicate.description : ""));
}
else if (run_this_test && ((! quiet_mode) || test_failed))
{
@@ -388,6 +392,7 @@ do_test_num(const char *progname,
const struct svn_test_descriptor_t *desc;
const int array_size = get_array_size(test_funcs);
svn_boolean_t run_this_test; /* This test's mode matches DESC->MODE. */
+ enum svn_test_mode_t test_mode;
/* Check our array bounds! */
if (test_num < 0)
@@ -402,11 +407,18 @@ do_test_num(const char *progname,
}
desc = &test_funcs[test_num];
- skip = desc->mode == svn_test_skip;
- xfail = desc->mode == svn_test_xfail;
+ /* Check the test predicate. */
+ if (desc->predicate.func
+ && desc->predicate.func(opts, desc->predicate.value, pool))
+ test_mode = desc->predicate.alternate_mode;
+ else
+ test_mode = desc->mode;
+
+ skip = test_mode == svn_test_skip;
+ xfail = test_mode == svn_test_xfail;
wimp = xfail && desc->wip;
msg = desc->msg;
- run_this_test = mode_filter == svn_test_all || mode_filter == desc->mode;
+ run_this_test = mode_filter == svn_test_all || mode_filter == test_mode;
if (run_this_test && header_msg && *header_msg)
{
@@ -488,6 +500,7 @@ test_thread(apr_thread_t *thread, void *
svn_error_t *err;
const struct svn_test_descriptor_t *desc;
svn_boolean_t run_this_test; /* This test's mode matches DESC->MODE. */
+ enum svn_test_mode_t test_mode;
test_params_t *params = data;
svn_atomic_t test_num;
apr_pool_t *pool;
@@ -510,11 +523,18 @@ test_thread(apr_thread_t *thread, void *
#endif
desc = ¶ms->test_funcs[test_num];
- skip = desc->mode == svn_test_skip;
- xfail = desc->mode == svn_test_xfail;
+ /* Check the test predicate. */
+ if (desc->predicate.func
+ && desc->predicate.func(params->opts, desc->predicate.value, pool))
+ test_mode = desc->predicate.alternate_mode;
+ else
+ test_mode = desc->mode;
+
+ skip = test_mode == svn_test_skip;
+ xfail = test_mode == svn_test_xfail;
wimp = xfail && desc->wip;
run_this_test = mode_filter == svn_test_all
- || mode_filter == desc->mode;
+ || mode_filter == test_mode;
/* Do test */
if (skip || !run_this_test)
@@ -600,7 +620,7 @@ do_tests_concurrently(const char *progna
CHECK_STATUS(result,
"Test thread returned an error.");
}
-
+
return params.got_error != FALSE;
}
@@ -1024,3 +1044,20 @@ svn_test_main(int argc, const char *argv
return got_error;
}
+
+
+svn_boolean_t
+svn_test__fs_type_is(const svn_test_opts_t *opts,
+ const char *predicate_value,
+ apr_pool_t *pool)
+{
+ return (0 == strcmp(predicate_value, opts->fs_type));
+}
+
+svn_boolean_t
+svn_test__fs_type_not(const svn_test_opts_t *opts,
+ const char *predicate_value,
+ apr_pool_t *pool)
+{
+ return (0 != strcmp(predicate_value, opts->fs_type));
+}
Propchange: subversion/branches/move-tracking-2/tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/tools:1462039-1462408
/subversion/branches/verify-keep-going/tools:1439280-1546110
/subversion/branches/wc-collate-path/tools:1402685-1480384
-/subversion/trunk/tools:1606692-1658451
+/subversion/trunk/tools:1606692-1660163
Modified: subversion/branches/move-tracking-2/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnlog.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnlog.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-centos/svnlog.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh Mon Feb 16 17:40:07 2015
@@ -24,15 +24,40 @@ if [ -z "$1" ]; then
exit 1
fi
+if [ -z "$2" ]; then
+ echo "Missing parameter: RAMdisk config file"
+ exit 1
+fi
+
volume="/Volumes/$1"
+ramconf="$2"
-mount | fgrep "on ${volume} " >/dev/null || {
+ramconfpath=$(dirname "${ramconf}")
+if [ ! -d "${ramconfpath}" ]; then
+ echo "Missing RAMdisk config file path: ${ramconfpath}"
+ exit 1
+fi
+if [ -f "${ramconf}" ]; then
+ echo "RAMdisk config file exists: ${ramconf}"
+ exit 1
+fi
+
+if [ -d "${volume}" ]; then
+ echo "Mount point exists: ${volume}"
+ exit 1
+fi
+
+mount | grep "^/dev/disk[0-9][0-9]* on ${volume} (hfs" >/dev/null || {
set -e
+ echo -n "" > "${ramconf}"
+
# Make sure we strip trailing spaces from the result of older
# versions of hduitil.
device=$(echo $(hdiutil attach -nomount ram://900000))
newfs_hfs -M 0700 -v "$1" "${device}"
hdiutil mountvol "${device}"
+
+ echo -n "${device}" > "${ramconf}"
}
exit 0
Modified: subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh Mon Feb 16 17:40:07 2015
@@ -24,11 +24,39 @@ if [ -z "$1" ]; then
exit 1
fi
+if [ -z "$2" ]; then
+ echo "Missing parameter: RAMdisk config file"
+ exit 1
+fi
+
volume="/Volumes/$1"
+ramconf="$2"
+
+if [ ! -f "${ramconf}" ]; then
+ mount | grep "^/dev/disk[0-9][0-9]* on ${volume} (hfs" || {
+ echo "Not mounted: ${volume}"
+ exit 0
+ }
+ echo "Missing RAMdisk config file: ${ramconf}"
+ exit 1
+fi
+
+if [ ! -d "${volume}" ]; then
+ echo "Mount point missing: ${volume}"
+ exit 1
+fi
+
+device=$(cat "${ramconf}")
+devfmt=$(echo "${device}" | grep "^/dev/disk[0-9][0-9]*$")
+if [ "${device}" != "${devfmt}" ]; then
+ echo "Invalid device name: ${device}"
+ exit 1
+fi
-mount | fgrep "on ${volume} " >/dev/null && {
+mount | grep "^${device} on ${volume} (hfs" >/dev/null && {
set -e
- hdiutil detach "${volume}" -force
+ rm "${ramconf}"
+ hdiutil detach "${device}" -force
}
exit 0
Modified: subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/setenv.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Mon Feb 16 17:40:07 2015
@@ -56,6 +56,9 @@ export LIBTOOL_CONFIG
# Set the absolute source path
abssrc=$(pwd)
+# Set the path to the RAMdisk device name file
+ramconf=$(dirname "${abssrc}")/ramdisk.conf
+
# The RAMdisk volume name is the same as the name of the builder
volume_name=$(basename $(dirname "${abssrc}"))
if [ -z "${volume_name}" ]; then
Modified: subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Mon Feb 16 17:40:07 2015
@@ -24,7 +24,7 @@ scripts=$(cd $(dirname "$0") && pwd)
. ${scripts}/setenv.sh
-${scripts}/mkramdisk.sh ${volume_name}
+${scripts}/mkramdisk.sh ${volume_name} ${ramconf}
# These are the default APR and Serf config options
serfconfig="--with-serf=${SVNBB_SERF} --with-apxs=/usr/sbin/apxs"
Modified: subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh Mon Feb 16 17:40:07 2015
@@ -24,4 +24,4 @@ scripts=$(cd $(dirname "$0") && pwd)
. ${scripts}/setenv.sh
-${scripts}/rmramdisk.sh ${volume_name}
+${scripts}/rmramdisk.sh ${volume_name} ${ramconf}
Modified: subversion/branches/move-tracking-2/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/buildbot/slaves/ubuntu-x64/svnlog.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (original)
+++ subversion/branches/move-tracking-2/tools/buildbot/slaves/ubuntu-x64/svnlog.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/client-side/svn-ssl-fingerprints.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/client-side/svn-ssl-fingerprints.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/client-side/svn-ssl-fingerprints.sh (original)
+++ subversion/branches/move-tracking-2/tools/client-side/svn-ssl-fingerprints.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/benchmarks/RepoPerf/copy_repo.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/benchmarks/RepoPerf/copy_repo.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/benchmarks/RepoPerf/copy_repo.py (original)
+++ subversion/branches/move-tracking-2/tools/dev/benchmarks/RepoPerf/copy_repo.py Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/benchmarks/RepoPerf/win_repo_bench.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/benchmarks/RepoPerf/win_repo_bench.py (original)
+++ subversion/branches/move-tracking-2/tools/dev/benchmarks/RepoPerf/win_repo_bench.py Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/benchmarks/large_dirs/create_bigdir.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/benchmarks/large_dirs/create_bigdir.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/benchmarks/large_dirs/create_bigdir.sh (original)
+++ subversion/branches/move-tracking-2/tools/dev/benchmarks/large_dirs/create_bigdir.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/build-svn-deps-win.pl
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/build-svn-deps-win.pl?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/build-svn-deps-win.pl (original)
+++ subversion/branches/move-tracking-2/tools/dev/build-svn-deps-win.pl Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/fsfs-access-map.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/fsfs-access-map.c?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/fsfs-access-map.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/fsfs-access-map.c Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/po-merge.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/po-merge.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/po-merge.py (original)
+++ subversion/branches/move-tracking-2/tools/dev/po-merge.py Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/remove-trailing-whitespace.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/remove-trailing-whitespace.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/remove-trailing-whitespace.sh (original)
+++ subversion/branches/move-tracking-2/tools/dev/remove-trailing-whitespace.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/dev/x509-parser.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/x509-parser.c?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/x509-parser.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/x509-parser.c Mon Feb 16 17:40:07 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/move-tracking-2/tools/diff/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/diff/diff.c?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/diff/diff.c (original)
+++ subversion/branches/move-tracking-2/tools/diff/diff.c Mon Feb 16 17:40:07 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/move-tracking-2/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dist/backport.pl?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dist/backport.pl (original)
+++ subversion/branches/move-tracking-2/tools/dist/backport.pl Mon Feb 16 17:40:07 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."
Modified: subversion/branches/move-tracking-2/tools/dist/backport_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dist/backport_tests.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dist/backport_tests.py (original)
+++ subversion/branches/move-tracking-2/tools/dist/backport_tests.py Mon Feb 16 17:40:07 2015
@@ -74,38 +74,38 @@ class BackportTest(object):
"""Return a decorator that: builds TEST_FUNC's sbox, creates
^/subversion/trunk, and calls TEST_FUNC, then compare its output to the
expected dump file named after TEST_FUNC."""
-
+
# .wraps() propagates the wrappee's docstring to the wrapper.
- @functools.wraps(test_func)
+ @functools.wraps(test_func)
def wrapped_test_func(sbox):
expected_dump_file = './%s.dump' % (test_func.func_name,)
sbox.build()
-
+
# r2: prepare ^/subversion/ tree
sbox.simple_mkdir('subversion', 'subversion/trunk')
sbox.simple_mkdir('subversion/tags', 'subversion/branches')
sbox.simple_move('A', 'subversion/trunk')
sbox.simple_move('iota', 'subversion/trunk')
sbox.simple_commit(message='Create trunk')
-
+
# r3: branch
sbox.simple_copy('subversion/trunk', 'branch')
sbox.simple_append('branch/STATUS', '')
sbox.simple_add('branch/STATUS')
sbox.simple_commit(message='Create branch, with STATUS file')
-
+
# r4: random change on trunk
sbox.simple_append('subversion/trunk/iota', 'First change\n')
sbox.simple_commit(message='First change')
-
+
# r5: random change on trunk
sbox.simple_append('subversion/trunk/A/mu', 'Second change\n')
sbox.simple_commit(message='Second change')
-
+
# Do the work.
test_func(sbox)
-
+
# Verify it.
verify_backport(sbox, expected_dump_file, self.uuid)
return wrapped_test_func
@@ -139,7 +139,7 @@ def serialize_entry(entry):
# notes
' Notes: %s\n' % (entry['notes'],) if entry['notes'] else '',
-
+
# branch
' Branch: %s\n' % (entry['branch'],) if entry['branch'] else '',
@@ -294,7 +294,7 @@ def backport_accept(sbox):
# r6: conflicting change on branch
sbox.simple_append('branch/iota', 'Conflicts with first change\n')
sbox.simple_commit(message="Conflicting change on iota")
-
+
# r7: nominate r4 with --accept (because of r6)
approved_entries = [
make_entry([4], notes="Merge with --accept=theirs-conflict."),
@@ -318,7 +318,7 @@ def backport_branches(sbox):
# r6: conflicting change on branch
sbox.simple_append('branch/iota', 'Conflicts with first change')
sbox.simple_commit(message="Conflicting change on iota")
-
+
# r7: backport branch
sbox.simple_update()
sbox.simple_copy('branch', 'subversion/branches/r4')
@@ -367,7 +367,7 @@ def backport_conflicts_detection(sbox):
# r6: conflicting change on branch
sbox.simple_append('branch/iota', 'Conflicts with first change\n')
sbox.simple_commit(message="Conflicting change on iota")
-
+
# r7: nominate r4, but without the requisite --accept
approved_entries = [
make_entry([4], notes="This will conflict."),
Propchange: subversion/branches/move-tracking-2/tools/dist/backport_tests.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/move-tracking-2/tools/dist/dist.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dist/dist.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dist/dist.sh (original)
+++ subversion/branches/move-tracking-2/tools/dist/dist.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/dist/nightly.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dist/nightly.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dist/nightly.sh (original)
+++ subversion/branches/move-tracking-2/tools/dist/nightly.sh Mon Feb 16 17:40:07 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
Modified: subversion/branches/move-tracking-2/tools/hook-scripts/control-chars.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/hook-scripts/control-chars.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
(empty)
Propchange: subversion/branches/move-tracking-2/tools/hook-scripts/control-chars.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/move-tracking-2/tools/hook-scripts/mailer/mailer.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/hook-scripts/mailer/mailer.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/branches/move-tracking-2/tools/hook-scripts/mailer/mailer.py Mon Feb 16 17:40:07 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/move-tracking-2/tools/hook-scripts/mailer/tests/mailer-init.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/hook-scripts/mailer/tests/mailer-init.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/hook-scripts/mailer/tests/mailer-init.sh (original)
+++ subversion/branches/move-tracking-2/tools/hook-scripts/mailer/tests/mailer-init.sh Mon Feb 16 17:40:07 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
Modified: subversion/branches/move-tracking-2/tools/hook-scripts/validate-files.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/hook-scripts/validate-files.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
(empty)
Propchange: subversion/branches/move-tracking-2/tools/hook-scripts/validate-files.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/move-tracking-2/tools/po/po-update.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/po/po-update.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/po/po-update.sh (original)
+++ subversion/branches/move-tracking-2/tools/po/po-update.sh Mon Feb 16 17:40:07 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/move-tracking-2/tools/server-side/svnpubsub/daemonize.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/server-side/svnpubsub/daemonize.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/server-side/svnpubsub/daemonize.py (original)
+++ subversion/branches/move-tracking-2/tools/server-side/svnpubsub/daemonize.py Mon Feb 16 17:40:07 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
"""
Modified: subversion/branches/move-tracking-2/tools/server-side/svnpubsub/svnpubsub/util.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/server-side/svnpubsub/svnpubsub/util.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
(empty)
Propchange: subversion/branches/move-tracking-2/tools/server-side/svnpubsub/svnpubsub/util.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/move-tracking-2/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/win-tests.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/win-tests.py (original)
+++ subversion/branches/move-tracking-2/win-tests.py Mon Feb 16 17:40:07 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'),
Propchange: subversion/branches/move-tracking-2/win-tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -0,0 +1,89 @@
+/subversion/branches/1.5.x-r30215/win-tests.py:870312
+/subversion/branches/1.7.x-fs-verify/win-tests.py:1146708,1161180
+/subversion/branches/10Gb/win-tests.py:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/win-tests.py:965046-1000689
+/subversion/branches/authzperf/win-tests.py:1615360
+/subversion/branches/auto-props-sdc/win-tests.py:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/win-tests.py:872050-872529
+/subversion/branches/cache-server/win-tests.py:1458643-1476567
+/subversion/branches/diff-callbacks3/win-tests.py:870059-870761
+/subversion/branches/diff-optimizations/win-tests.py:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/win-tests.py:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/win-tests.py:870728-871118
+/subversion/branches/double-delete/win-tests.py:870511-872970
+/subversion/branches/dump-load-cross-check/win-tests.py:1654853-1657295
+/subversion/branches/ev2-export/win-tests.py:1325914,1332738,1413107
+/subversion/branches/explore-wc/win-tests.py:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/win-tests.py:871779-873302
+/subversion/branches/fs-rep-sharing/win-tests.py:869036-873803
+/subversion/branches/fsfs-format7/win-tests.py:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/win-tests.py:1499981-1547039
+/subversion/branches/fsfs-lock-many/win-tests.py:1571740-1577217
+/subversion/branches/fsfs-pack/win-tests.py:873717-874575
+/subversion/branches/fsx/win-tests.py:1507845-1509914
+/subversion/branches/fsx-id/win-tests.py:1645603-1649011
+/subversion/branches/gnome-keyring/win-tests.py:870558-871410
+/subversion/branches/gpg-agent-password-store/win-tests.py:1005036-1150766
+/subversion/branches/gtest_addition/win-tests.py:1452117-1502138
+/subversion/branches/http-protocol-v2/win-tests.py:874395-876041
+/subversion/branches/in-memory-cache/win-tests.py:869829-871452
+/subversion/branches/in-repo-authz/win-tests.py:1414342-1424779
+/subversion/branches/inheritable-props/win-tests.py:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/win-tests.py:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/win-tests.py:998649-998852
+/subversion/branches/integrate-compression-level/win-tests.py:1068651-1072287
+/subversion/branches/integrate-io-improvements/win-tests.py:1068684-1072297
+/subversion/branches/integrate-is-cachable/win-tests.py:1072568-1074082
+/subversion/branches/integrate-partial-getter/win-tests.py:1072558-1076552
+/subversion/branches/integrate-readline-speedup/win-tests.py:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/win-tests.py:1068695-1072516
+/subversion/branches/integrate-string-improvements/win-tests.py:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/win-tests.py:1072541-1078213
+/subversion/branches/issue-2779-dev/win-tests.py:965496-984198
+/subversion/branches/issue-2843-dev/win-tests.py:871432-874179
+/subversion/branches/issue-3000/win-tests.py:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/win-tests.py:873375-874084
+/subversion/branches/issue-3148-dev/win-tests.py:875193-875204
+/subversion/branches/issue-3220-dev/win-tests.py:872210-872226
+/subversion/branches/issue-3242-dev/win-tests.py:879653-896436
+/subversion/branches/issue-3334-dirs/win-tests.py:875156-875867
+/subversion/branches/issue-3975/win-tests.py:1152931-1160746
+/subversion/branches/issue-4116-dev/win-tests.py:1424719-1425040
+/subversion/branches/issue-4194-dev/win-tests.py:1410507-1414880
+/subversion/branches/javahl-ra/win-tests.py:991978-1494640
+/subversion/branches/kwallet/win-tests.py:870785-871314
+/subversion/branches/log-addressing/win-tests.py:1509279-1546844
+/subversion/branches/log-g-performance/win-tests.py:870941-871032
+/subversion/branches/merge-skips-obstructions/win-tests.py:874525-874615
+/subversion/branches/multi-layer-moves/win-tests.py:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/win-tests.py:870276,870376
+/subversion/branches/node_pool/win-tests.py:1304828-1305388
+/subversion/branches/performance/win-tests.py:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-10293
40,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/win-tests.py:956579-1033052
+/subversion/branches/ra_serf-digest-authn/win-tests.py:875693-876404
+/subversion/branches/reintegrate-improvements/win-tests.py:873853-874164
+/subversion/branches/remote-only-status/win-tests.py:1581845-1586090
+/subversion/branches/revprop-cache/win-tests.py:1298521-1326293
+/subversion/branches/revprop-caching-ng/win-tests.py:1620597,1620599
+/subversion/branches/revprop-packing/win-tests.py:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/win-tests.py:876734-878766
+/subversion/branches/svn-auth-x509/win-tests.py:1603509-1655900
+/subversion/branches/svn-mergeinfo-enhancements/win-tests.py:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/win-tests.py:918519-934609
+/subversion/branches/svn_mutex/win-tests.py:1141683-1182099
+/subversion/branches/svnpatch-diff/win-tests.py:865738-876477
+/subversion/branches/svnraisetc/win-tests.py:874709-875149
+/subversion/branches/svnserve-logging/win-tests.py:869828-870893
+/subversion/branches/tc-issue-3334/win-tests.py:874697-874773
+/subversion/branches/tc-merge-notify/win-tests.py:874017-874062
+/subversion/branches/tc-resolve/win-tests.py:874191-874239
+/subversion/branches/tc_url_rev/win-tests.py:874351-874483
+/subversion/branches/tree-conflicts/win-tests.py:868291-873154
+/subversion/branches/tree-conflicts-notify/win-tests.py:873926-874008
+/subversion/branches/tristate-chunked-request/win-tests.py:1502394-1502681
+/subversion/branches/tweak-build-take-two/win-tests.py:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/win-tests.py:1060426-1064427
+/subversion/branches/verify-at-commit/win-tests.py:1462039-1462408
+/subversion/branches/verify-keep-going/win-tests.py:1439280-1546110
+/subversion/branches/wc-collate-path/win-tests.py:1402685-1480384
+/subversion/trunk/win-tests.py:1606692-1660163