Author: rhuijben
Date: Fri Feb 13 20:36:06 2015
New Revision: 1659668
URL: http://svn.apache.org/r1659668
Log:
Following up on r1659509, extend the whitespace cleanup script to include
.sql and .sh files
* tools/dev/remove-trailing-whitespace.sh
Update script.
* autogen.sh
* subversion/libsvn_wc/wc-metadata.sql
* subversion/libsvn_wc/wc-queries.sql
* subversion/tests/cmdline/dav-mirror-autocheck.sh
* subversion/tests/cmdline/davautocheck.sh
* subversion/tests/cmdline/lock_tests.py
* tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
* tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
* tools/buildbot/slaves/svn-x64-centos/svnlog.sh
* tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
* tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
* tools/buildbot/slaves/ubuntu-x64/svnlog.sh
* tools/client-side/svn-ssl-fingerprints.sh
* tools/dev/benchmarks/large_dirs/create_bigdir.sh
* tools/dist/dist.sh
* tools/dist/nightly.sh
* tools/hook-scripts/mailer/tests/mailer-init.sh
* tools/po/po-update.sh
Apply whitespace cleanup.
Modified:
subversion/trunk/autogen.sh
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
subversion/trunk/subversion/libsvn_wc/wc-queries.sql
subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnlog.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
subversion/trunk/tools/client-side/svn-ssl-fingerprints.sh
subversion/trunk/tools/dev/benchmarks/large_dirs/create_bigdir.sh
subversion/trunk/tools/dev/remove-trailing-whitespace.sh
subversion/trunk/tools/dist/dist.sh
subversion/trunk/tools/dist/nightly.sh
subversion/trunk/tools/hook-scripts/mailer/tests/mailer-init.sh
subversion/trunk/tools/po/po-update.sh
Modified: subversion/trunk/autogen.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/autogen.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/autogen.sh (original)
+++ subversion/trunk/autogen.sh Fri Feb 13 20:36:06 2015
@@ -205,7 +205,7 @@ fi
echo "Creating svn_private_config.h.in..."
${AUTOHEADER:-autoheader}
-# If there's a config.cache file, we may need to delete it.
+# If there's a config.cache file, we may need to delete it.
# If we have an existing configure script, save a copy for comparison.
if [ -f config.cache ] && [ -f configure ]; then
cp configure configure.$$.tmp
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Fri Feb 13 20:36:06
2015
@@ -108,7 +108,7 @@ CREATE TABLE PRISTINE (
);
CREATE INDEX I_PRISTINE_MD5 ON PRISTINE (md5_checksum);
-
+
/* ------------------------------------------------------------------------- */
/* The ACTUAL_NODE table describes text changes and property changes
@@ -150,7 +150,7 @@ CREATE TABLE ACTUAL_NODE (
/* if not NULL, this node is part of a changelist. */
changelist TEXT,
-
+
/* ### need to determine values. "unknown" (no info), "admin" (they
### used something like 'svn edit'), "noticed" (saw a mod while
### scanning the filesystem). */
@@ -170,7 +170,7 @@ CREATE TABLE ACTUAL_NODE (
/* stsp: This is meant for text conflicts, right? What about property
conflicts? Why do we need these in a column to refer to the
pristine store? Can't we just parse the checksums from
- conflict_data as well?
+ conflict_data as well?
rhuijben: Because that won't allow triggers to handle refcounts.
We would have to scan all conflict skels before cleaning up the
a single file from the pristine stor */
@@ -200,7 +200,7 @@ CREATE TABLE LOCK (
lock_owner TEXT,
lock_comment TEXT,
lock_date INTEGER, /* an APR date/time (usec since 1970) */
-
+
PRIMARY KEY (repos_id, repos_relpath)
);
@@ -553,7 +553,7 @@ CREATE TABLE EXTERNALS (
/* the kind of the external. */
kind TEXT NOT NULL,
- /* The local relpath of the directory NODE defining this external
+ /* The local relpath of the directory NODE defining this external
(Defaults to the parent directory of the file external after upgrade) */
def_local_relpath TEXT NOT NULL,
@@ -774,7 +774,7 @@ LIMIT 1
/* ------------------------------------------------------------------------- */
-/* Format 28 involves no schema changes, it only converts MD5 pristine
+/* Format 28 involves no schema changes, it only converts MD5 pristine
references to SHA1. */
-- STMT_UPGRADE_TO_28
Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Fri Feb 13 20:36:06
2015
@@ -253,7 +253,7 @@ WHERE wc_id = ?1 AND IS_STRICT_DESCENDAN
-- STMT_DELETE_WORKING_OP_DEPTH
DELETE FROM nodes
-WHERE wc_id = ?1
+WHERE wc_id = ?1
AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth = ?3
@@ -323,7 +323,7 @@ ORDER BY d.local_relpath DESC
-- STMT_SELECT_OP_DEPTH_CHILDREN
SELECT local_relpath, kind FROM nodes
-WHERE wc_id = ?1
+WHERE wc_id = ?1
AND parent_relpath = ?2
AND op_depth = ?3
AND presence != MAP_BASE_DELETED
@@ -332,7 +332,7 @@ ORDER BY local_relpath
-- STMT_SELECT_OP_DEPTH_CHILDREN_EXISTS
SELECT local_relpath, kind FROM nodes
-WHERE wc_id = ?1
+WHERE wc_id = ?1
AND parent_relpath = ?2
AND op_depth = ?3
AND presence IN (MAP_NORMAL, MAP_INCOMPLETE)
@@ -466,7 +466,7 @@ SELECT (SELECT b.presence FROM nodes AS
WHERE b.wc_id = ?1 AND b.local_relpath = ?2 AND b.op_depth = 0),
work.presence, work.op_depth, moved.moved_to
FROM nodes_current AS work
-LEFT OUTER JOIN nodes AS moved
+LEFT OUTER JOIN nodes AS moved
ON moved.wc_id = work.wc_id
AND moved.local_relpath = work.local_relpath
AND moved.moved_to IS NOT NULL
@@ -543,7 +543,7 @@ UPDATE nodes SET repos_id = ?4, dav_cach
WHERE (wc_id = ?1 AND local_relpath = ?2 AND repos_id = ?3)
OR (wc_id = ?1 AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
AND repos_id = ?3)
-
+
-- STMT_UPDATE_LOCK_REPOS_ID
UPDATE lock SET repos_id = ?2
@@ -800,7 +800,7 @@ WHERE wc_id = ?1
OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND (changelist IS NULL
OR NOT EXISTS (SELECT 1 FROM nodes_current c
- WHERE c.wc_id = ?1
+ WHERE c.wc_id = ?1
AND c.local_relpath = actual_node.local_relpath
AND c.kind = MAP_FILE))
Modified: subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh Fri Feb
13 20:36:06 2015
@@ -23,7 +23,7 @@
# to the slave. The test should be able to throw all kinds
# of svn operations at one or the other, and master/slave
# verified as identical in the end.
-#
+#
# Master / slave setup is achieved in a single httpd process
# using virtual hosts bound to different addresses on the
# loopback network (127.0.0.1, 127.0.0.2) for slave and
@@ -34,7 +34,7 @@
# http://subversion.tigris.org/issues/show_bug.cgi?id=2939
# But of course, any svn traffic liable to break over
# mirroring would be a good addition.
-#
+#
# Most of the httpd setup was lifted from davautocheck.sh.
# The common boilerplate snippets to setup/start/stop httpd
# between the two could be factored out and shared.
@@ -95,7 +95,7 @@ function get_prog_name() {
return 1
}
-# splat out httpd config
+# splat out httpd config
function setup_config() {
say "setting up config: " $1
@@ -152,7 +152,7 @@ CustomLog "${HTTPD_ROOT}/ops"
ServerName ${SLAVE_HOST}
CustomLog "${HTTPD_ROOT}/slave_access_log" common
ErrorLog "${HTTPD_ROOT}/slave_error_log"
-# slave 'normal' location
+# slave 'normal' location
<Location "/${SLAVE_LOCATION}">
DAV svn
SVNPath "${SLAVE_REPOS}"
@@ -196,7 +196,7 @@ function usage() {
echo
echo " " '<test-work-directory>' must not exist, \
I will not clobber it for you 1>&2
- exit 1
+ exit 1
}
### Start execution here ###
@@ -403,7 +403,7 @@ $SVNSYNC initialize --non-interactive "$
#
# reproducible test case from:
# http://subversion.tigris.org/issues/show_bug.cgi?id=2939
-#
+#
BASE_URL="$SLAVE_URL"
say running svnmucc test to $BASE_URL
svnmucc="$SVNMUCC --non-interactive --username jrandom --password rayjandom
-mm"
@@ -492,7 +492,7 @@ say "Some house-keeping..."
say "Re-activating the post-commit hook on the master repo: $MASTER_REPOS."
mv "$MASTER_REPOS/hooks/post-commit_" "$MASTER_REPOS/hooks/post-commit"
say "Syncing slave with master."
-$SVNSYNC --non-interactive sync "$SYNC_URL" --username=svnsync
--password=svnsync
+$SVNSYNC --non-interactive sync "$SYNC_URL" --username=svnsync
--password=svnsync
# shut it down
echo -n "${SCRIPT}: stopping httpd: "
$HTTPD -f $HTTPD_CONFIG -k stop
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Fri Feb 13
20:36:06 2015
@@ -62,7 +62,7 @@
# one version's client against another version's server) specify both APXS
# *and* MODULE_PATH for the other server:
#
-# APXS=/opt/svn/1.4.x/bin/apxs MODULE_PATH=/opt/svn/1.4.x/modules \
+# APXS=/opt/svn/1.4.x/bin/apxs MODULE_PATH=/opt/svn/1.4.x/modules \
# subversion/tests/cmdline/davautocheck.sh
#
# To prevent the server from advertising httpv2, pass USE_HTTPV1 in
@@ -71,7 +71,7 @@
# To enable "SVNCacheRevProps on" set CACHE_REVPROPS in the environment.
#
# To test over https set USE_SSL in the environment.
-#
+#
# To use value for "SVNPathAuthz" directive set SVN_PATH_AUTHZ with
# appropriate value in the environment.
#
@@ -114,7 +114,7 @@ query() {
if [ -n "$BASH_VERSION" ]; then
read -n 1 -t 32
else
- #
+ #
prog="
import select as s
import sys
@@ -163,7 +163,7 @@ get_prog_name() {
}
# Don't assume sbin is in the PATH.
-# ### Presumably this is used to locate /usr/sbin/apxs or /usr/sbin/apache2
+# ### Presumably this is used to locate /usr/sbin/apxs or /usr/sbin/apache2
PATH="$PATH:/usr/sbin:/usr/local/sbin"
# Find the source and build directories. The build dir can be found if it is
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri Feb 13 20:36:06
2015
@@ -2385,7 +2385,7 @@ def delete_dir_with_lots_of_locked_files
locked_paths = []
for i in range(nfiles):
locked_paths.append("A/locked_files/file-%i" % i)
-
+
# Create files at these paths
os.mkdir(sbox.ospath("A/locked_files"))
for file_path in locked_paths:
@@ -2407,7 +2407,7 @@ def delete_dir_with_lots_of_locked_files
# XFAIL: As of 1.8.10, this commit fails with:
# svn: E175002: Unexpected HTTP status 400 'Bad Request' on '<path>'
# and the following error in the httpd error log:
- # request failed: error reading the headers
+ # request failed: error reading the headers
# This problem was introduced on the 1.8.x branch in r1606976.
sbox.simple_commit()
Modified: subversion/trunk/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
(original)
+++ subversion/trunk/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh Fri Feb
13 20:36:06 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/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh Fri Feb
13 20:36:06 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/trunk/tools/buildbot/slaves/svn-x64-centos/svnlog.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnlog.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnlog.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnlog.sh Fri Feb 13
20:36:06 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/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
---
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
(original)
+++
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
Fri Feb 13 20:36:06 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/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
(original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
Fri Feb 13 20:36:06 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/trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh Fri Feb 13
20:36:06 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/trunk/tools/client-side/svn-ssl-fingerprints.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-ssl-fingerprints.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-ssl-fingerprints.sh (original)
+++ subversion/trunk/tools/client-side/svn-ssl-fingerprints.sh Fri Feb 13
20:36:06 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/trunk/tools/dev/benchmarks/large_dirs/create_bigdir.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/large_dirs/create_bigdir.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/large_dirs/create_bigdir.sh (original)
+++ subversion/trunk/tools/dev/benchmarks/large_dirs/create_bigdir.sh Fri Feb
13 20:36:06 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/trunk/tools/dev/remove-trailing-whitespace.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/remove-trailing-whitespace.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/dev/remove-trailing-whitespace.sh (original)
+++ subversion/trunk/tools/dev/remove-trailing-whitespace.sh Fri Feb 13
20:36:06 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/trunk/tools/dist/dist.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/dist.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/dist/dist.sh (original)
+++ subversion/trunk/tools/dist/dist.sh Fri Feb 13 20:36:06 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/trunk/tools/dist/nightly.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/nightly.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/dist/nightly.sh (original)
+++ subversion/trunk/tools/dist/nightly.sh Fri Feb 13 20:36:06 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/trunk/tools/hook-scripts/mailer/tests/mailer-init.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/mailer/tests/mailer-init.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/hook-scripts/mailer/tests/mailer-init.sh (original)
+++ subversion/trunk/tools/hook-scripts/mailer/tests/mailer-init.sh Fri Feb 13
20:36:06 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/trunk/tools/po/po-update.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/po/po-update.sh?rev=1659668&r1=1659667&r2=1659668&view=diff
==============================================================================
--- subversion/trunk/tools/po/po-update.sh (original)
+++ subversion/trunk/tools/po/po-update.sh Fri Feb 13 20:36:06 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 )
}
