You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/11/23 02:12:45 UTC
svn commit: r1412731 [1/10] - in /subversion/branches/ev2-export: ./ build/
build/ac-macros/ contrib/client-side/svnmerge/
contrib/server-side/svncutter/ notes/ subversion/
subversion/bindings/javahl/native/ subversion/bindings/swig/perl/native/
subver...
Author: hwright
Date: Fri Nov 23 01:12:18 2012
New Revision: 1412731
URL: http://svn.apache.org/viewvc?rev=1412731&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk, resolving conflicts.
This increases the number of test failures on this branch to 18.
Added:
subversion/branches/ev2-export/subversion/include/private/svn_diff_private.h
- copied unchanged from r1412631, subversion/trunk/subversion/include/private/svn_diff_private.h
subversion/branches/ev2-export/subversion/tests/libsvn_wc/wc-test.c
- copied unchanged from r1412631, subversion/trunk/subversion/tests/libsvn_wc/wc-test.c
subversion/branches/ev2-export/tools/server-side/fsfs-stats.c
- copied unchanged from r1412631, subversion/trunk/tools/server-side/fsfs-stats.c
Removed:
subversion/branches/ev2-export/subversion/tests/libsvn_subr/target-test.c
Modified:
subversion/branches/ev2-export/ (props changed)
subversion/branches/ev2-export/CHANGES
subversion/branches/ev2-export/Makefile.in
subversion/branches/ev2-export/build.conf
subversion/branches/ev2-export/build/ac-macros/apache.m4
subversion/branches/ev2-export/build/ac-macros/apr.m4
subversion/branches/ev2-export/build/ac-macros/aprutil.m4
subversion/branches/ev2-export/build/ac-macros/serf.m4
subversion/branches/ev2-export/build/ac-macros/sqlite.m4
subversion/branches/ev2-export/build/run_tests.py
subversion/branches/ev2-export/configure.ac
subversion/branches/ev2-export/contrib/client-side/svnmerge/svnmerge_test.py
subversion/branches/ev2-export/contrib/server-side/svncutter/svncutter
subversion/branches/ev2-export/notes/dump-load-format.txt
subversion/branches/ev2-export/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNICriticalSection.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIMutex.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/Revision.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/StringArray.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/Targets.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/Targets.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Repos.pm
subversion/branches/ev2-export/subversion/bindings/swig/ruby/svn/info.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/svn/util.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/my-assertions.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test-unit-ext.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test-unit-ext/priority.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_core.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_delta.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_fs.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_repos.rb
subversion/branches/ev2-export/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/ev2-export/subversion/include/private/svn_client_private.h
subversion/branches/ev2-export/subversion/include/private/svn_named_atomic.h
subversion/branches/ev2-export/subversion/include/private/svn_string_private.h
subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
subversion/branches/ev2-export/subversion/include/svn_client.h
subversion/branches/ev2-export/subversion/include/svn_diff.h
subversion/branches/ev2-export/subversion/include/svn_error_codes.h
subversion/branches/ev2-export/subversion/include/svn_fs.h
subversion/branches/ev2-export/subversion/include/svn_props.h
subversion/branches/ev2-export/subversion/include/svn_wc.h
subversion/branches/ev2-export/subversion/libsvn_client/add.c
subversion/branches/ev2-export/subversion/libsvn_client/client.h
subversion/branches/ev2-export/subversion/libsvn_client/commit.c
subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_client/diff.c
subversion/branches/ev2-export/subversion/libsvn_client/info.c
subversion/branches/ev2-export/subversion/libsvn_client/list.c
subversion/branches/ev2-export/subversion/libsvn_client/merge.c
subversion/branches/ev2-export/subversion/libsvn_client/patch.c
subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c
subversion/branches/ev2-export/subversion/libsvn_client/ra.c
subversion/branches/ev2-export/subversion/libsvn_client/revisions.c
subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
subversion/branches/ev2-export/subversion/libsvn_delta/debug_editor.c
subversion/branches/ev2-export/subversion/libsvn_delta/svndiff.c
subversion/branches/ev2-export/subversion/libsvn_delta/text_delta.c
subversion/branches/ev2-export/subversion/libsvn_diff/diff.h
subversion/branches/ev2-export/subversion/libsvn_diff/diff_file.c
subversion/branches/ev2-export/subversion/libsvn_diff/diff_memory.c
subversion/branches/ev2-export/subversion/libsvn_diff/parse-diff.c
subversion/branches/ev2-export/subversion/libsvn_diff/util.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/caching.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/structure
subversion/branches/ev2-export/subversion/libsvn_ra_local/split_url.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/property.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/ev2-export/subversion/libsvn_ra_serf/replay.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/serf.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/update.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/util.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/client.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/ev2-export/subversion/libsvn_repos/load.c
subversion/branches/ev2-export/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/ev2-export/subversion/libsvn_subr/cache_config.c
subversion/branches/ev2-export/subversion/libsvn_subr/config_win.c
subversion/branches/ev2-export/subversion/libsvn_subr/dirent_uri.c
subversion/branches/ev2-export/subversion/libsvn_subr/error.c
subversion/branches/ev2-export/subversion/libsvn_subr/named_atomic.c
subversion/branches/ev2-export/subversion/libsvn_subr/spillbuf.c
subversion/branches/ev2-export/subversion/libsvn_subr/string.c
subversion/branches/ev2-export/subversion/libsvn_subr/utf_width.c
subversion/branches/ev2-export/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/ev2-export/subversion/libsvn_wc/adm_files.c
subversion/branches/ev2-export/subversion/libsvn_wc/adm_ops.c
subversion/branches/ev2-export/subversion/libsvn_wc/cleanup.c
subversion/branches/ev2-export/subversion/libsvn_wc/context.c
subversion/branches/ev2-export/subversion/libsvn_wc/copy.c
subversion/branches/ev2-export/subversion/libsvn_wc/externals.c
subversion/branches/ev2-export/subversion/libsvn_wc/info.c
subversion/branches/ev2-export/subversion/libsvn_wc/lock.c
subversion/branches/ev2-export/subversion/libsvn_wc/node.c
subversion/branches/ev2-export/subversion/libsvn_wc/props.c
subversion/branches/ev2-export/subversion/libsvn_wc/status.c
subversion/branches/ev2-export/subversion/libsvn_wc/update_editor.c
subversion/branches/ev2-export/subversion/libsvn_wc/upgrade.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/ev2-export/subversion/libsvn_wc/wc.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_private.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/ev2-export/subversion/mod_dav_svn/authz.c
subversion/branches/ev2-export/subversion/mod_dav_svn/dav_svn.h
subversion/branches/ev2-export/subversion/mod_dav_svn/reports/update.c
subversion/branches/ev2-export/subversion/mod_dav_svn/repos.c
subversion/branches/ev2-export/subversion/svn/add-cmd.c
subversion/branches/ev2-export/subversion/svn/import-cmd.c
subversion/branches/ev2-export/subversion/svn/main.c
subversion/branches/ev2-export/subversion/svn/mergeinfo-cmd.c
subversion/branches/ev2-export/subversion/svn/propget-cmd.c
subversion/branches/ev2-export/subversion/svn/proplist-cmd.c
subversion/branches/ev2-export/subversion/svn_private_config.hw
subversion/branches/ev2-export/subversion/svnadmin/main.c
subversion/branches/ev2-export/subversion/svndumpfilter/main.c
subversion/branches/ev2-export/subversion/svnlook/main.c
subversion/branches/ev2-export/subversion/svnmucc/svnmucc.c
subversion/branches/ev2-export/subversion/svnrdump/dump_editor.c
subversion/branches/ev2-export/subversion/svnserve/cyrus_auth.c
subversion/branches/ev2-export/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/copy_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/depth_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/diff_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/export_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/externals_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/import_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/patch_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/prop_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/special_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump
subversion/branches/ev2-export/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/factory.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/main.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/verify.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/wc.py
subversion/branches/ev2-export/subversion/tests/cmdline/switch_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/update_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/ev2-export/subversion/tests/libsvn_client/client-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/io-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/path-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/string-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/db-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.h
subversion/branches/ev2-export/subversion/tests/svn_test_fs.c
subversion/branches/ev2-export/tools/server-side/fsfs-reorg.c
subversion/branches/ev2-export/tools/server-side/svn-backup-dumps.py
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1404841-1412631
Modified: subversion/branches/ev2-export/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/CHANGES?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/CHANGES (original)
+++ subversion/branches/ev2-export/CHANGES Fri Nov 23 01:12:18 2012
@@ -104,7 +104,7 @@ http://svn.apache.org/repos/asf/subversi
- Client-side bugfixes:
* Fix "svn status -u --depth empty FILE" (r1348822, r1349215)
* Fix example output of 'svn help status' (issue #3962)
- * svn propset of svn:eol-style might not notice related text changes (r1353572)
+ * propset of svn:eol-style might not notice related text changes (r1353572)
* sort output of 'svn propget -R' (r1355699)
* sort output of 'svn proplist' (r1355698)
* sort output of 'svn status' (r1341012)
Modified: subversion/branches/ev2-export/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/Makefile.in?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/Makefile.in (original)
+++ subversion/branches/ev2-export/Makefile.in Fri Nov 23 01:12:18 2012
@@ -283,7 +283,7 @@ INSTALL_EXTRA_SWIG_PY=\
# export an env variable so that the tests can run without being installed
TEST_SHLIB_VAR_SWIG_PY=\
- if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+ if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
@SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
@@ -326,7 +326,7 @@ INSTALL_EXTRA_SWIG_RB=\
# export an env variable so that the tests can run without being installed
TEST_SHLIB_VAR_SWIG_RB=\
- if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+ if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
@SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
@@ -517,6 +517,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(SSL_CERT)" != ""; then \
flags="--ssl-cert $(SSL_CERT) $$flags"; \
fi; \
+ if test "$(HTTP_PROXY)" != ""; then \
+ flags="--http-proxy $(HTTP_PROXY) $$flags"; \
+ fi; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
@@ -842,9 +845,14 @@ swig-rb: autogen-swig-rb
check-swig-rb: swig-rb svnserve
$(TEST_SHLIB_VAR_SWIG_RB) \
cd $(SWIG_RB_DIR); \
- $(RUBY) -I $(SWIG_RB_SRC_DIR) \
- $(SWIG_RB_SRC_DIR)/test/run-test.rb \
- --verbose=$(SWIG_RB_TEST_VERBOSE)
+ if [ "$(RUBY_MAJOR)" -eq 1 -a "$(RUBY_MINOR)" -lt 9 ] ; then \
+ $(RUBY) -I $(SWIG_RB_SRC_DIR) \
+ $(SWIG_RB_SRC_DIR)/test/run-test.rb \
+ --verbose=$(SWIG_RB_TEST_VERBOSE); \
+ else \
+ $(RUBY) -I $(SWIG_RB_SRC_DIR) \
+ $(SWIG_RB_SRC_DIR)/test/run-test.rb; \
+ fi
EXTRACLEAN_SWIG_RB=rm -f $(SWIG_RB_SRC_DIR)/svn_*.c $(SWIG_RB_SRC_DIR)/core.c
Modified: subversion/branches/ev2-export/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build.conf?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build.conf (original)
+++ subversion/branches/ev2-export/build.conf Fri Nov 23 01:12:18 2012
@@ -226,7 +226,7 @@ type = lib
path = subversion/libsvn_diff
libs = libsvn_subr apriconv apr zlib
install = lib
-msvc-export = svn_diff.h
+msvc-export = svn_diff.h private\svn_diff_private.h
# The repository filesystem library
[libsvn_fs]
@@ -886,14 +886,6 @@ sources = utf-test.c
install = test
libs = libsvn_test libsvn_subr apriconv apr
-[target-test]
-description = Test the condense_targets functions
-type = exe
-path = subversion/tests/libsvn_subr
-sources = target-test.c
-install = test
-libs = libsvn_test libsvn_subr apriconv apr
-
[subst_translate-test]
description = Test the svn_subst_translate* functions
type = exe
@@ -1022,6 +1014,14 @@ sources = wc-queries-test.c
install = test
libs = libsvn_test libsvn_subr apriconv apr sqlite
+[wc-test]
+description = Test the main WC API functions
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-test.c utils.c
+install = test
+libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+
# ----------------------------------------------------------------------------
# These are not unit tests at all, they are small programs that exercise
# parts of the libsvn_delta API from the command line. They are stuck here
@@ -1171,7 +1171,7 @@ libs = __ALL__
strings-reps-test changes-test locks-test repos-test
checksum-test compat-test config-test hashdump-test mergeinfo-test
opt-test path-test stream-test string-test time-test utf-test
- target-test error-test cache-test spillbuf-test crypto-test
+ error-test cache-test spillbuf-test crypto-test
named_atomic-test named_atomic-proc-test revision-test
subst_translate-test io-test
translate-test
@@ -1180,10 +1180,10 @@ libs = __ALL__
ra-local-test
svndiff-test vdelta-test
entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester
- diff diff3 diff4 fsfs-reorg svn-bench
+ diff diff3 diff4 fsfs-reorg fsfs-stats svn-bench
client-test
conflict-data-test db-test pristine-store-test entries-compat-test
- op-depth-test dirent_uri-test wc-queries-test
+ op-depth-test dirent_uri-test wc-queries-test wc-test
auth-test
parse-diff-test
svn-rep-sharing-stats svn-populate-node-origins-index
@@ -1236,6 +1236,13 @@ sources = fsfs-reorg.c
install = tools
libs = libsvn_delta libsvn_subr apr
+[fsfs-stats]
+type = exe
+path = tools/server-side
+sources = fsfs-stats.c
+install = tools
+libs = libsvn_delta libsvn_subr apr
+
[diff]
type = exe
path = tools/diff
Modified: subversion/branches/ev2-export/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/apache.m4?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/apache.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/apache.m4 Fri Nov 23 01:12:18 2012
@@ -97,7 +97,7 @@ if test -n "$APXS" && test "$APXS" != "n
apache_minor_version_wanted_regex="0"
;;
1)
- apache_minor_version_wanted_regex=["[1-4]"]
+ apache_minor_version_wanted_regex=["[1-5]"]
;;
2)
apache_minor_version_wanted_regex=["[3-5]"]
Modified: subversion/branches/ev2-export/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/apr.m4?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/apr.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/apr.m4 Fri Nov 23 01:12:18 2012
@@ -125,11 +125,11 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
echo "get it with SVN and put it in a subdirectory of this source:"
echo ""
echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x \\"
+ echo " http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x \\"
echo " apr"
echo ""
echo "Run that right here in the top level of the Subversion tree."
- echo "Afterwards, run apr/buildconf in that subdirectory and"
+ echo "Afterwards, run ./buildconf in that subdirectory and"
echo "then run configure again here."
echo ""
echo "Whichever of the above you do, you probably need to do"
@@ -138,7 +138,7 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
echo "getting both from SVN with:"
echo ""
echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\"
+ echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
echo " apr-util"
echo ""
AC_MSG_ERROR([no suitable apr found])
Modified: subversion/branches/ev2-export/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/aprutil.m4?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/aprutil.m4 Fri Nov 23 01:12:18 2012
@@ -129,11 +129,11 @@ AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
echo "get it with SVN and put it in a subdirectory of this source:"
echo ""
echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\"
+ echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
echo " apr-util"
echo ""
echo "Run that right here in the top level of the Subversion tree."
- echo "Afterwards, run apr-util/buildconf in that subdirectory and"
+ echo "Afterwards, run ./buildconf in that subdirectory and"
echo "then run configure again here."
echo ""
AC_MSG_ERROR([no suitable APRUTIL found])
Modified: subversion/branches/ev2-export/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/serf.m4?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/serf.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/serf.m4 Fri Nov 23 01:12:18 2012
@@ -145,6 +145,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
serf_found=yes
SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs`
+ break
else
AC_MSG_RESULT([no])
AC_MSG_WARN([Serf version too old: need $serf_check_version])
Modified: subversion/branches/ev2-export/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/sqlite.m4?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/sqlite.m4 Fri Nov 23 01:12:18 2012
@@ -243,9 +243,9 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo ""
echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
echo " ${SQLITE_URL}"
- echo "unpack the archive using tar/gunzip and copy sqlite3.c from the"
+ echo "unpack the archive using tar/gunzip and rename the"
echo "resulting directory to:"
- echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
+ echo "$abs_srcdir/sqlite-amalgamation"
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
])
Modified: subversion/branches/ev2-export/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/run_tests.py?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/run_tests.py (original)
+++ subversion/branches/ev2-export/build/run_tests.py Fri Nov 23 01:12:18 2012
@@ -28,7 +28,7 @@
[--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
[--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
[--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
- [--server-minor-version=<version>]
+ [--server-minor-version=<version>] [--http-proxy=<host>:<port>]
[--config-file=<file>] [--ssl-cert=<file>]
<abs_srcdir> <abs_builddir>
<prog ...>
@@ -124,7 +124,8 @@ class TestHarness:
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
fsfs_sharding=None, fsfs_packing=None,
list_tests=None, svn_bin=None, mode_filter=None,
- milestone_filter=None, set_log_level=None, ssl_cert=None):
+ milestone_filter=None, set_log_level=None, ssl_cert=None,
+ http_proxy=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -176,6 +177,7 @@ class TestHarness:
self.mode_filter = mode_filter
self.log = None
self.ssl_cert = ssl_cert
+ self.http_proxy = http_proxy
if not sys.stdout.isatty() or sys.platform == 'win32':
TextColors.disable()
@@ -477,6 +479,8 @@ class TestHarness:
svntest.main.options.mode_filter = self.mode_filter
if self.ssl_cert is not None:
svntest.main.options.ssl_cert = self.ssl_cert
+ if self.http_proxy is not None:
+ svntest.main.options.http_proxy = self.http_proxy
svntest.main.options.srcdir = self.srcdir
@@ -640,7 +644,8 @@ def main():
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
- 'mode-filter=', 'set-log-level=', 'ssl-cert='])
+ 'mode-filter=', 'set-log-level=', 'ssl-cert=',
+ 'http-proxy='])
except getopt.GetoptError:
args = []
@@ -651,9 +656,9 @@ def main():
base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
- set_log_level, ssl_cert = \
+ set_log_level, ssl_cert, http_proxy = \
None, None, None, None, None, None, None, None, None, None, None, \
- None, None, None, None, None, None
+ None, None, None, None, None, None, None
for opt, val in opts:
if opt in ['-u', '--url']:
base_url = val
@@ -689,6 +694,8 @@ def main():
set_log_level = val
elif opt in ['--ssl-cert']:
ssl_cert = val
+ elif opt in ['--http-proxy']:
+ http_proxy = val
else:
raise getopt.GetoptError
@@ -704,7 +711,8 @@ def main():
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing, list_tests,
mode_filter=mode_filter, milestone_filter=milestone_filter,
- set_log_level=set_log_level, ssl_cert=ssl_cert)
+ set_log_level=set_log_level, ssl_cert=ssl_cert,
+ http_proxy=http_proxy)
failed = th.run(args[2:])
if failed:
Modified: subversion/branches/ev2-export/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/configure.ac?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/configure.ac (original)
+++ subversion/branches/ev2-export/configure.ac Fri Nov 23 01:12:18 2012
@@ -1145,7 +1145,7 @@ AC_PATH_PROG(PERL, perl, none)
if test -n "$RUBY"; then
AC_PATH_PROG(RUBY, "$RUBY", none)
else
- AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18, none)
+ AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193, none)
fi
if test "$RUBY" != "none"; then
AC_MSG_CHECKING([rb_hash_foreach])
@@ -1154,7 +1154,7 @@ if test "$RUBY" != "none"; then
if test -n "$RDOC"; then
AC_PATH_PROG(RDOC, "$RDOC", none)
else
- AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
+ AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193, none)
fi
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
@@ -1166,14 +1166,23 @@ if test "$RUBY" != "none"; then
])
RUBY_MINOR="$svn_cv_ruby_minor"
+ AC_CACHE_CHECK([for Ruby teeny version], [svn_cv_ruby_teeny],[
+ svn_cv_ruby_teeny="`$RUBY -rrbconfig -e 'major, minor, teeny = RUBY_VERSION.split("."); print teeny;'`"
+ ])
+ RUBY_TEENY="$svn_cv_ruby_teeny"
+
AC_SUBST(RUBY_MAJOR)
AC_SUBST(RUBY_MINOR)
- if test ! \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "8" \); then
- # Disallow Ruby 1.9 or later until the binding tests get fixed
- # to run with those versions.
+ AC_SUBST(RUBY_TEENY)
+ if test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -gt "8" -a "$RUBY_TEENY" -lt "3" \); then
+ # Disallow Ruby between 1.8.7 and 1.9.3
RUBY="none"
- AC_MSG_WARN([The detected Ruby is too new for Subversion to use])
- AC_MSG_WARN([Only 1.8.x releases are supported at this time])
+ AC_MSG_WARN([The detected Ruby is between 1.9 and 1.9.3])
+ AC_MSG_WARN([Only 1.8.x and 1.9.3 releases are supported at this time])
+ elif test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
+ #Warn about 1.9.3 support
+ AC_MSG_WARN([WARNING: The detected Ruby is 1.9.3])
+ AC_MSG_WARN([WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new])
fi
else
AC_MSG_RESULT([no])
@@ -1393,6 +1402,10 @@ dnl Provide ${host} for use in compiled
AC_DEFINE_UNQUOTED([SVN_BUILD_HOST], "${host}",
[Defined to the config.guess name of the build system])
+dnl Provide ${target} for use in compiled code (for user-agent string)
+AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
+ [Defined to the config.guess name of the build target])
+
AC_OUTPUT
# ==== Print final messages to user ==========================================
Modified: subversion/branches/ev2-export/contrib/client-side/svnmerge/svnmerge_test.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/contrib/client-side/svnmerge/svnmerge_test.py?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/contrib/client-side/svnmerge/svnmerge_test.py (original)
+++ subversion/branches/ev2-export/contrib/client-side/svnmerge/svnmerge_test.py Fri Nov 23 01:12:18 2012
@@ -1139,7 +1139,7 @@ D test3"""
def testMergeAndRollbackEmptyRevisionRange(self):
"""Init svnmerge, modify source head, merge, rollback where no merge
- occured."""
+ occurred."""
# Initialize svnmerge
self.svnmerge2(["init", self.test_repo_url + "/trunk"])
Modified: subversion/branches/ev2-export/contrib/server-side/svncutter/svncutter
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/contrib/server-side/svncutter/svncutter?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/contrib/server-side/svncutter/svncutter (original)
+++ subversion/branches/ev2-export/contrib/server-side/svncutter/svncutter Fri Nov 23 01:12:18 2012
@@ -5,14 +5,14 @@
# under the prevailing license of their project.
"""
-svncutter - clique-squash, range-selection, and property mutations on SVN dump files
+svncutter - clique-squash, range-selection, property mutations, and skeletonization on SVN dump files
general usage: svncutter [-q] [-r SELECTION] SUBCOMMAND
In all commands, the -r (or --range) option limits the selection of revisions
over which an operation will be performed. A selection consists of
one or more comma-separated ranges. A range may consist of an integer
revision number or the special name HEAD for the head revision. Or it
-may be a colon-separated pair of integers, ir an integer followed by a
+may be a colon-separated pair of integers, or an integer followed by a
colon followed by HEAD.
Normally, each subcommand produces a progress spinner on standard
@@ -29,6 +29,7 @@ Available subcommands:
proprename
log
setlog
+ skeleton
"""
oneliners = {
@@ -39,6 +40,7 @@ oneliners = {
"proprename": "Renaming revision properties",
"log": "Extracting log entries",
"setlog": "Mutating log entries",
+ "skeleton": "strip content, leave only headers",
}
helpdict = {
@@ -51,7 +53,7 @@ This can be helpful in cleaning up after
revision control systems, or if a developer has been using a pre-2006
version of Emacs VC.
-With the -m (or --mapfile) option, squash emits a map to tne named
+With the -m (or --mapfile) option, squash emits a map to the named
file showing how old revision numbers map into new ones.
With the -e (or --excise) option, the specified set of revisions in
@@ -68,7 +70,7 @@ anything that looks like the regular exp
a comment reference (this is the same format that Subversion uses
in log headers).
-Every revision in the file after the first omiited onf gets the property
+Every revision in the file after the first omitted one gets the property
'svncutter:original' set to the revision number it had before the
squash operation.
@@ -121,6 +123,12 @@ Replace the log entries in the input dum
in the LOGFILE, which should be in the format of an svn log output.
Replacements may be restricted to a specified range.
""",
+ "skeleton": """\
+skeleton: usage: svncutter [-r SELECTION] skeleton
+
+Strip out all content. Does not produce a valid dumpfile, but may be useful
+when you need to examine a particularly complex node structure.
+""",
}
import os, sys, calendar, time, getopt, re
@@ -177,7 +185,7 @@ class LineBufferedSource:
"Read a line, require it to have a specified prefix."
line = self.readline()
if not line:
- sys.stderr.write("svncutter: unexpected end of input." + os.linesep)
+ sys.stderr.write("svncutter: unexpected end of input while requiring '%s' input." % prefix + os.linesep)
sys.exit(1)
assert line.startswith(prefix)
return line
@@ -211,7 +219,7 @@ class DumpfileSource(LineBufferedSource)
LineBufferedSource.__init__(self, infile)
self.baton = baton
def read_revision_header(self, property_hook=None):
- "Read a revision header, parsing its proprties."
+ "Read a revision header, parsing its properties."
properties = {}
propkeys = []
stash = self.require("Revision-number:")
@@ -241,6 +249,43 @@ class DumpfileSource(LineBufferedSource)
if self.baton:
self.baton.twirl()
return (revision, stash, properties)
+ def read_node(self):
+ "Read a node header and body."
+ #print "READ NODE BEGINS"
+ header = self.require("Node-path:")
+ while True:
+ line = self.readline()
+ #print "I see header line", repr(line)
+ if not line:
+ sys.stderr.write('unexpected EOF in node header' + os.linesep)
+ sys.exit(1)
+ header += line
+ if line == '\n':
+ break
+ properties = ""
+ if "Prop-content-length" in header:
+ while True:
+ line = self.readline()
+ #print "I see property line", repr(line)
+ if not line:
+ sys.stderr.write('unexpected EOF in node properties' + os.linesep)
+ sys.exit(1)
+ properties += line
+ if line == 'PROPS-END\n':
+ break
+ content = ""
+ if "Text-content-length" in header:
+ while True:
+ line = self.readline()
+ #print "I see contents line", repr(line)
+ if not line:
+ break
+ content += line
+ if line.startswith("Node-path:") or line.startswith("Revision-number"):
+ self.push(line)
+ break
+ #print "READ NODE ENDS"
+ return (header, properties, content)
def read_until_next(self, prefix, revmap=None):
"Accumulate lines until the next matches a specified prefix."
stash = ""
@@ -312,7 +357,7 @@ class SubversionRange:
return self.txt
class Logfile:
- "Represent the state of a lofile"
+ "Represent the state of a logfile"
def __init__(self, readable, restriction=None):
self.comments = {}
self.source = LineBufferedSource(readable)
@@ -610,12 +655,49 @@ def setlog(source, logpatch, selection):
return (propkeys, propdict)
source.apply_property_hook(selection, loghook)
+def skeletonize(source, selection):
+ "Skeletonize a portion of the dump file defined by a revision selection."
+ emit = 0 in selection
+ stash = source.read_until_next("Revision-number:")
+ if emit:
+ sys.stdout.write(stash)
+ if not source.has_line_buffered():
+ return
+ while True:
+ (revision,stash,properties) = source.read_revision_header()
+ if revision in selection:
+ sys.stdout.write(stash)
+ emit = True
+ elif revision == selection.upperbound()+1:
+ return
+ else:
+ source.read_until_next("Revision-number:")
+ continue
+ while True:
+ line = source.readline()
+ if not line:
+ return
+ elif line == '\n':
+ sys.stdout.write(line)
+ continue
+ elif line.startswith("Revision-number:"):
+ source.push(line)
+ break
+ elif line.startswith("Node-path:"):
+ source.push(line)
+ (header, properties, content) = source.read_node()
+ sys.stdout.write(header + properties)
+ continue
+ else:
+ sys.stderr.write("svncutter: parse at %s doesn't look right (%s), aborting!\n" % (revision, repr(line)))
+ sys.exit(1)
+
if __name__ == '__main__':
try:
- (options, arguments) = getopt.getopt(sys.argv[1:], "ce:fl:m:p:qr:",
+ (options, arguments) = getopt.getopt(sys.argv[1:], "ce:fl:m:p:qr:s",
["excise", "flagrefs", "revprop=",
"logpatch=", "map=",
- "quiet", "range="])
+ "quiet", "range=", "skeleton"])
selection = SubversionRange("0:HEAD")
timefuzz = 300 # 5 minute fuzz
compressmap = False
@@ -646,11 +728,11 @@ if __name__ == '__main__':
sys.stderr.write("Type 'svncutter help' for usage." + os.linesep)
sys.exit(1)
baton = None
- #if arguments[0] != 'help':
- # if progress:
- # baton = Baton(oneliners[arguments[0]], "done")
- # else:
- # baton = None
+ if arguments[0] != 'help':
+ if progress:
+ baton = Baton(oneliners[arguments[0]], "done")
+ else:
+ baton = None
if arguments[0] == "squash":
squash(DumpfileSource(sys.stdin, baton),
timefuzz, mapto, selection, excise, flagrefs, compressmap)
@@ -678,6 +760,8 @@ if __name__ == '__main__':
if not logpatch:
sys.stderr.write("svncutter: setlog requires a log entries file.\n")
setlog(DumpfileSource(sys.stdin, baton), logpatch, selection)
+ elif arguments[0] == "skeleton":
+ skeletonize(DumpfileSource(sys.stdin, baton), selection)
elif arguments[0] == "help":
if len(arguments) == 1:
sys.stdout.write(__doc__)
Modified: subversion/branches/ev2-export/notes/dump-load-format.txt
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/notes/dump-load-format.txt?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/notes/dump-load-format.txt (original)
+++ subversion/branches/ev2-export/notes/dump-load-format.txt Fri Nov 23 01:12:18 2012
@@ -297,7 +297,7 @@ $ echo "Replacement text" > dir/file.txt
$ svn ci -m "Replace dir/file.txt with a copy of otherdir/otherfile.txt and replace its text, too."
-------------------------------------------------------------------
-$Subversion filesystems do not allow the root directory ("/") to be
+Subversion filesystems do not allow the root directory ("/") to be
deleted or replaced.
=== Some details about copyfroms ===
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/ClientContext.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/ClientContext.cpp Fri Nov 23 01:12:18 2012
@@ -126,7 +126,7 @@ struct clearctx_baton_t
static apr_status_t clear_ctx_ptrs(void *ptr)
{
- clearctx_baton_t *bt = (clearctx_baton_t*)ptr;
+ clearctx_baton_t *bt = reinterpret_cast<clearctx_baton_t*>(ptr);
/* Reset all values to those before overwriting by getContext. */
*bt->ctx = *bt->backup;
@@ -149,9 +149,11 @@ ClientContext::getContext(CommitMessage
Note that this allows creating a stack of context changes if
the function is invoked multiple times with different pools.
*/
- clearctx_baton_t *bt = (clearctx_baton_t *)apr_pcalloc(pool, sizeof(*bt));
+ clearctx_baton_t *bt =
+ reinterpret_cast<clearctx_baton_t *>(apr_pcalloc(pool, sizeof(*bt)));
bt->ctx = ctx;
- bt->backup = (svn_client_ctx_t*)apr_pmemdup(pool, ctx, sizeof(*ctx));
+ bt->backup =
+ reinterpret_cast<svn_client_ctx_t*>(apr_pmemdup(pool, ctx, sizeof(*ctx)));
apr_pool_cleanup_register(in_pool.getPool(), bt, clear_ctx_ptrs,
clear_ctx_ptrs);
@@ -167,9 +169,10 @@ ClientContext::getContext(CommitMessage
bt->backup->config = ctx->config;
}
- svn_config_t *config = (svn_config_t *) apr_hash_get(ctx->config,
- SVN_CONFIG_CATEGORY_CONFIG,
- APR_HASH_KEY_STRING);
+ svn_config_t *config =
+ reinterpret_cast<svn_config_t *>(apr_hash_get(ctx->config,
+ SVN_CONFIG_CATEGORY_CONFIG,
+ APR_HASH_KEY_STRING));
/* The whole list of registered providers */
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/CopySources.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/CopySources.cpp Fri Nov 23 01:12:18 2012
@@ -95,12 +95,13 @@ CopySources::array(SVN::Pool &pool)
std::vector<jobject> sources = m_copySources.vector();
apr_array_header_t *copySources =
- apr_array_make(p, sources.size(), sizeof(svn_client_copy_source_t *));
+ apr_array_make(p, static_cast<int>(sources.size()),
+ sizeof(svn_client_copy_source_t *));
for (std::vector<jobject>::const_iterator it = sources.begin();
it < sources.end(); ++it)
{
svn_client_copy_source_t *src =
- (svn_client_copy_source_t *) apr_palloc(p, sizeof(*src));
+ reinterpret_cast<svn_client_copy_source_t *>(apr_palloc(p, sizeof(*src)));
// Extract the path or URL from the copy source.
static jmethodID getPath = 0;
@@ -141,10 +142,8 @@ CopySources::array(SVN::Pool &pool)
// TODO: Default this to svn_opt_revision_undefined (or HEAD)
Revision rev(jrev);
- src->revision = (const svn_opt_revision_t *)
- apr_palloc(p, sizeof(*src->revision));
- memcpy((void *) src->revision, rev.revision(),
- sizeof(*src->revision));
+ src->revision = reinterpret_cast<const svn_opt_revision_t *>
+ (apr_pmemdup(p, rev.revision(), sizeof(*src->revision)));
env->DeleteLocalRef(jrev);
// Extract pegRevision from the copy source.
@@ -161,10 +160,8 @@ CopySources::array(SVN::Pool &pool)
return NULL;
Revision pegRev(jPegRev, true);
- src->peg_revision = (const svn_opt_revision_t *)
- apr_palloc(p, sizeof(*src->peg_revision));
- memcpy((void *) src->peg_revision, pegRev.revision(),
- sizeof(*src->peg_revision));
+ src->peg_revision = reinterpret_cast<const svn_opt_revision_t *>
+ (apr_pmemdup(p, pegRev.revision(), sizeof(*src->peg_revision)));
env->DeleteLocalRef(jPegRev);
APR_ARRAY_PUSH(copySources, svn_client_copy_source_t *) = src;
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.cpp Fri Nov 23 01:12:18 2012
@@ -20,8 +20,8 @@
* ====================================================================
* @endcopyright
*
- * @file ConflictResolverCallback.cpp
- * @brief Implementation of the class ConflictResolverCallback.
+ * @file CreateJ.cpp
+ * @brief Implementation of the class CreateJ.
*/
#include "svn_error.h"
@@ -206,9 +206,9 @@ CreateJ::Checksum(const svn_checksum_t *
POP_AND_RETURN_NULL;
}
- jbyteArray jdigest = JNIUtil::makeJByteArray(
- (const signed char *)checksum->digest,
- svn_checksum_size(checksum));
+ jbyteArray jdigest
+ = JNIUtil::makeJByteArray(checksum->digest,
+ static_cast<int>(svn_checksum_size(checksum)));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1019,21 +1019,22 @@ jobject CreateJ::PropertyMap(apr_hash_t
POP_AND_RETURN_NULL;
apr_hash_index_t *hi;
- int i = 0;
for (hi = apr_hash_first(apr_hash_pool_get(prop_hash), prop_hash);
- hi; hi = apr_hash_next(hi), ++i)
+ hi; hi = apr_hash_next(hi))
{
const char *key;
svn_string_t *val;
- apr_hash_this(hi, (const void **)&key, NULL, (void **)&val);
+ apr_hash_this(hi,
+ reinterpret_cast<const void **>(&key),
+ NULL,
+ reinterpret_cast<void **>(&val));
jstring jpropName = JNIUtil::makeJString(key);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
- jbyteArray jpropVal = JNIUtil::makeJByteArray(
- (const signed char *)val->data, val->len);
+ jbyteArray jpropVal = JNIUtil::makeJByteArray(val);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/EnumMapper.cpp Fri Nov 23 01:12:18 2012
@@ -81,7 +81,8 @@ jobject EnumMapper::mapChangePathAction(
jobject EnumMapper::mapNotifyState(svn_wc_notify_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status", (int) state);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status",
+ static_cast<int>(state));
}
/**
@@ -90,13 +91,15 @@ jobject EnumMapper::mapNotifyState(svn_w
jobject EnumMapper::mapNotifyAction(svn_wc_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action",
+ static_cast<int>(action));
}
jobject EnumMapper::mapReposNotifyNodeAction(svn_node_action action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction",
+ static_cast<int>(action));
}
/**
@@ -105,7 +108,8 @@ jobject EnumMapper::mapReposNotifyNodeAc
jobject EnumMapper::mapReposNotifyAction(svn_repos_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action",
+ static_cast<int>(action));
}
/**
@@ -114,7 +118,8 @@ jobject EnumMapper::mapReposNotifyAction
jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/NodeKind", (int) nodeKind);
+ return mapEnum(JAVA_PACKAGE"/types/NodeKind",
+ static_cast<int>(nodeKind));
}
/**
@@ -123,7 +128,8 @@ jobject EnumMapper::mapNodeKind(svn_node
jobject EnumMapper::mapNotifyLockState(svn_wc_notify_lock_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus", (int) state);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus",
+ static_cast<int>(state));
}
/**
@@ -132,7 +138,8 @@ jobject EnumMapper::mapNotifyLockState(s
jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind", (int) schedule);
+ return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind",
+ static_cast<int>(schedule));
}
/**
@@ -142,31 +149,36 @@ jobject EnumMapper::mapStatusKind(svn_wc
{
// We're assuming a valid value for the C enum above
// The offset here is +1
- return mapEnum(JAVA_PACKAGE"/types/Status$Kind", ((int) svnKind) - 1);
+ return mapEnum(JAVA_PACKAGE"/types/Status$Kind",
+ static_cast<int>(svnKind) - 1);
}
jobject EnumMapper::mapChecksumKind(svn_checksum_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind", (int) kind);
+ return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind",
+ static_cast<int>(kind));
}
jobject EnumMapper::mapConflictKind(svn_wc_conflict_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind", (int) kind);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind",
+ static_cast<int>(kind));
}
jobject EnumMapper::mapConflictAction(svn_wc_conflict_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action",
+ static_cast<int>(action));
}
jobject EnumMapper::mapConflictReason(svn_wc_conflict_reason_t reason)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason", (int) reason);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason",
+ static_cast<int>(reason));
}
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
@@ -182,45 +194,47 @@ int EnumMapper::toLogLevel(jobject jLogL
svn_depth_t EnumMapper::toDepth(jobject jdepth)
{
// The offset for depths is -2
- return (svn_depth_t) (getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
+ return static_cast<svn_depth_t>(getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
}
jobject EnumMapper::mapDepth(svn_depth_t depth)
{
// We're assuming a valid value for the C enum above
// The offset for depths is -2
- return mapEnum(JAVA_PACKAGE"/types/Depth", ((int) depth) + 2);
+ return mapEnum(JAVA_PACKAGE"/types/Depth", static_cast<int>(depth) + 2);
}
jobject EnumMapper::mapOperation(svn_wc_operation_t operation)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation", (int) operation);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation",
+ static_cast<int>(operation));
}
jobject EnumMapper::mapTristate(svn_tristate_t tristate)
{
// We're assuming a valid value for the C enum above
return mapEnum(JAVA_PACKAGE"/types/Tristate",
- (int) (tristate - svn_tristate_false));
+ static_cast<int>(tristate - svn_tristate_false));
}
svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)
{
- return (svn_wc_conflict_choice_t) getOrdinal(
- JAVA_PACKAGE"/ConflictResult$Choice", jchoice);
+ return static_cast<svn_wc_conflict_choice_t>
+ (getOrdinal(JAVA_PACKAGE"/ConflictResult$Choice", jchoice));
}
svn_opt_revision_kind EnumMapper::toRevisionKind(jobject jkind)
{
- return (svn_opt_revision_kind) getOrdinal(JAVA_PACKAGE"/types/Revision$Kind",
- jkind);
+ return static_cast<svn_opt_revision_kind>
+ (getOrdinal(JAVA_PACKAGE"/types/Revision$Kind", jkind));
}
jobject EnumMapper::mapSummarizeKind(svn_client_diff_summarize_kind_t sKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind", (int) sKind);
+ return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind",
+ static_cast<int>(sKind));
}
jobject EnumMapper::mapEnum(const char *clazzName, int index)
@@ -282,5 +296,5 @@ int EnumMapper::getOrdinal(const char *c
POP_AND_RETURN(-1);
env->PopLocalFrame(NULL);
- return (int) jorder;
+ return static_cast<int>(jorder);
}
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/InputStream.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/InputStream.cpp Fri Nov 23 01:12:18 2012
@@ -89,8 +89,7 @@ svn_error_t *InputStream::read(void *bat
}
// Allocate a Java byte array to read the data.
- jbyteArray data = JNIUtil::makeJByteArray((const signed char*)buffer,
- *len);
+ jbyteArray data = JNIUtil::makeJByteArray(buffer, static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -138,7 +137,7 @@ svn_error_t *InputStream::close(void *ba
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton
- InputStream *that = (InputStream*)baton;
+ InputStream *that = reinterpret_cast<InputStream*>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/JNICriticalSection.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/JNICriticalSection.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/JNICriticalSection.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/JNICriticalSection.cpp Fri Nov 23 01:12:18 2012
@@ -39,7 +39,7 @@
JNICriticalSection::JNICriticalSection(JNIMutex &mutex)
{
m_mutex = &mutex;
- apr_status_t apr_err = apr_thread_mutex_lock (mutex.m_mutex);
+ apr_status_t apr_err = apr_thread_mutex_lock(mutex.m_mutex);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_lock");
@@ -53,7 +53,7 @@ JNICriticalSection::JNICriticalSection(J
*/
JNICriticalSection::~JNICriticalSection()
{
- apr_status_t apr_err = apr_thread_mutex_unlock (m_mutex->m_mutex);
+ apr_status_t apr_err = apr_thread_mutex_unlock(m_mutex->m_mutex);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_unlock");
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIMutex.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIMutex.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIMutex.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIMutex.cpp Fri Nov 23 01:12:18 2012
@@ -38,7 +38,7 @@
JNIMutex::JNIMutex(apr_pool_t *pool)
{
apr_status_t apr_err =
- apr_thread_mutex_create (&m_mutex, APR_THREAD_MUTEX_NESTED, pool);
+ apr_thread_mutex_create(&m_mutex, APR_THREAD_MUTEX_NESTED, pool);
if (apr_err)
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_create");
}
@@ -48,7 +48,7 @@ JNIMutex::JNIMutex(apr_pool_t *pool)
*/
JNIMutex::~JNIMutex()
{
- apr_status_t apr_err = apr_thread_mutex_destroy (m_mutex);
+ apr_status_t apr_err = apr_thread_mutex_destroy(m_mutex);
if (apr_err)
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_destroy");
}
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.cpp Fri Nov 23 01:12:18 2012
@@ -124,7 +124,7 @@ void JNIThreadData::pushNewThreadData()
}
JNIThreadData *newData = new JNIThreadData();
newData->m_previous =data;
- apr_err = apr_threadkey_private_set (newData, g_key);
+ apr_err = apr_threadkey_private_set(newData, g_key);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
@@ -151,7 +151,7 @@ void JNIThreadData::popThreadData()
JNIThreadData *oldData = data->m_previous;
delete data;
- apr_err = apr_threadkey_private_set (oldData, g_key);
+ apr_err = apr_threadkey_private_set(oldData, g_key);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.h
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.h?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.h (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIThreadData.h Fri Nov 23 01:12:18 2012
@@ -21,7 +21,7 @@
* @endcopyright
*
* @file JNIThreadData.h
- * @brief Interface of the class JNIData
+ * @brief Interface of the class JNIThreadData
*/
#ifndef JNITHREADDATA_H
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.cpp Fri Nov 23 01:12:18 2012
@@ -211,7 +211,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
GetModuleFileNameW(moduleHandle, ucs2_path, inwords);
inwords = lstrlenW(ucs2_path);
outbytes = outlength = 3 * (inwords + 1);
- utf8_path = (char *)apr_palloc(pool, outlength);
+ utf8_path = reinterpret_cast<char *>(apr_palloc(pool, outlength));
apr_err = apr_conv_ucs2_to_utf8((const apr_wchar_t *) ucs2_path,
&inwords, utf8_path, &outbytes);
if (!apr_err && (inwords > 0 || outbytes == 0))
@@ -240,7 +240,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
/* See http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt */
/* ### This code really only needs to be invoked by consumers of
### the libsvn_wc library, which basically means SVNClient. */
- if (getenv ("SVN_ASP_DOT_NET_HACK"))
+ if (getenv("SVN_ASP_DOT_NET_HACK"))
{
err = svn_wc_set_adm_dir("_svn", g_pool);
if (err)
@@ -395,7 +395,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
return;
char *tmp_path;
- char *path = svn_relpath_dirname(err->file, err->pool);
+ char *path = svn_dirent_dirname(err->file, err->pool);
while (tmp_path = strchr(path, '/'))
*tmp_path = '.';
@@ -403,7 +403,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
if (isJavaExceptionThrown())
return;
- jstring jfileName = makeJString(svn_relpath_basename(err->file, err->pool));
+ jstring jfileName = makeJString(svn_dirent_basename(err->file, err->pool));
if (isJavaExceptionThrown())
return;
@@ -795,7 +795,7 @@ jobject JNIUtil::createDate(apr_time_t t
* @param data the character array
* @param length the number of characters in the array
*/
-jbyteArray JNIUtil::makeJByteArray(const signed char *data, int length)
+jbyteArray JNIUtil::makeJByteArray(const void *data, int length)
{
if (data == NULL)
{
@@ -827,6 +827,15 @@ jbyteArray JNIUtil::makeJByteArray(const
}
/**
+ * Create a Java byte array from an svn_string_t.
+ * @param str the string
+ */
+jbyteArray JNIUtil::makeJByteArray(const svn_string_t *str)
+{
+ return JNIUtil::makeJByteArray(str->data, static_cast<int>(str->len));
+}
+
+/**
* Build the error message from the svn error into buffer. This
* method calls itselft recursively for all the chained errors
*
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.h?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.h Fri Nov 23 01:12:18 2012
@@ -41,6 +41,8 @@ struct svn_error_t;
#define JAVA_PACKAGE "org/apache/subversion/javahl"
+struct svn_string_t;
+
/**
* Class to hold a number of JNI related utility methods. No Objects
* of this class are ever created.
@@ -62,7 +64,8 @@ class JNIUtil
int aprErr = -1);
static void throwNullPointerException(const char *message);
- static jbyteArray makeJByteArray(const signed char *data, int length);
+ static jbyteArray makeJByteArray(const void *data, int length);
+ static jbyteArray makeJByteArray(const svn_string_t *str);
static jobject createDate(apr_time_t time);
static void logMessage(const char *message);
static int getLogLevel();
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/LogMessageCallback.cpp Fri Nov 23 01:12:18 2012
@@ -102,9 +102,10 @@ LogMessageCallback::singleMessage(svn_lo
hi;
hi = apr_hash_next(hi))
{
- const char *path = (const char *) svn__apr_hash_index_key(hi);
+ const char *path =
+ reinterpret_cast<const char *>(svn__apr_hash_index_key(hi));
svn_log_changed_path2_t *log_item =
- (svn_log_changed_path2_t *) svn__apr_hash_index_val(hi);
+ reinterpret_cast<svn_log_changed_path2_t *>(svn__apr_hash_index_val(hi));
jobject cp = CreateJ::ChangedPath(path, log_item);
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/OutputStream.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/OutputStream.cpp Fri Nov 23 01:12:18 2012
@@ -95,8 +95,7 @@ svn_error_t *OutputStream::write(void *b
}
// convert the data to a Java byte array
- jbyteArray data = JNIUtil::makeJByteArray((const signed char*)buffer,
- *len);
+ jbyteArray data = JNIUtil::makeJByteArray(buffer, static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -120,7 +119,7 @@ svn_error_t *OutputStream::close(void *b
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton
- OutputStream *that = (OutputStream*)baton;
+ OutputStream *that = reinterpret_cast<OutputStream*>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.cpp Fri Nov 23 01:12:18 2012
@@ -73,12 +73,12 @@ Path::init(const char *pi_path, SVN::Poo
{
if (*pi_path == 0)
{
- m_error_occured = NULL;
+ m_error_occurred = NULL;
m_path = "";
}
else
{
- m_error_occured = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
+ m_error_occurred = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
m_path = pi_path;
}
@@ -108,15 +108,15 @@ Path::c_str() const
Path&
Path::operator=(const Path &pi_path)
{
- m_error_occured = NULL;
+ m_error_occurred = NULL;
m_path = pi_path.m_path;
return *this;
}
- svn_error_t *Path::error_occured() const
+ svn_error_t *Path::error_occurred() const
{
- return m_error_occured;
+ return m_error_occurred;
}
jboolean Path::isValid(const char *p)
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.h
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.h?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.h (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/Path.h Fri Nov 23 01:12:18 2012
@@ -41,7 +41,7 @@ class Path
// The path to be stored.
std::string m_path;
- svn_error_t *m_error_occured;
+ svn_error_t *m_error_occurred;
/**
* Initialize the class.
@@ -90,7 +90,7 @@ class Path
*/
const char *c_str() const;
- svn_error_t *error_occured() const;
+ svn_error_t *error_occurred() const;
/**
* Returns whether @a path is non-NULL and passes the @c
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/Prompter.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/Prompter.cpp Fri Nov 23 01:12:18 2012
@@ -429,7 +429,7 @@ svn_error_t *Prompter::simple_prompt(svn
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_simple_t *ret =
- (svn_auth_cred_simple_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_simple_t*>(apr_pcalloc(pool, sizeof(*ret)));
if (!that->prompt(realm, username, may_save ? true : false))
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
_("User canceled dialog"));
@@ -462,7 +462,7 @@ svn_error_t *Prompter::username_prompt(s
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_username_t *ret =
- (svn_auth_cred_username_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_username_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *user = that->askQuestion(realm, _("Username: "), true,
may_save ? true : false);
if (user == NULL)
@@ -486,7 +486,7 @@ Prompter::ssl_server_trust_prompt(svn_au
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_server_trust_t *ret =
- (svn_auth_cred_ssl_server_trust_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool, sizeof(*ret)));
std::string question = _("Error validating server certificate for ");
question += realm;
@@ -552,7 +552,7 @@ Prompter::ssl_client_cert_prompt(svn_aut
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_client_cert_t *ret =
- (svn_auth_cred_ssl_client_cert_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_ssl_client_cert_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *cert_file =
that->askQuestion(realm, _("client certificate filename: "), true,
may_save ? true : false);
@@ -574,7 +574,7 @@ Prompter::ssl_client_cert_pw_prompt(svn_
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_client_cert_pw_t *ret =
- (svn_auth_cred_ssl_client_cert_pw_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_ssl_client_cert_pw_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *info = that->askQuestion(realm,
_("client certificate passphrase: "),
false, may_save ? true : false);
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/Revision.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/Revision.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/Revision.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/Revision.cpp Fri Nov 23 01:12:18 2012
@@ -31,7 +31,7 @@
const svn_opt_revision_kind Revision::START = svn_opt_revision_unspecified;
const svn_opt_revision_kind Revision::HEAD = svn_opt_revision_head;
-Revision::Revision (const svn_opt_revision_kind kind)
+Revision::Revision(const svn_opt_revision_kind kind)
{
m_revision.kind = kind;
m_revision.value.number = 0;
@@ -149,7 +149,7 @@ Revision::~Revision()
{
}
-const svn_opt_revision_t *Revision::revision () const
+const svn_opt_revision_t *Revision::revision() const
{
return &m_revision;
}
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/RevisionRange.cpp Fri Nov 23 01:12:18 2012
@@ -20,7 +20,7 @@
* ====================================================================
* @endcopyright
*
- * @file RevisionRanges.cpp
+ * @file RevisionRange.cpp
* @brief Implementation of the class RevisionRange.
*/
@@ -87,7 +87,8 @@ const svn_opt_revision_range_t *Revision
return NULL;
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *) apr_palloc(pool.getPool(), sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_palloc(pool.getPool(), sizeof(*range)));
range->start = *startRevision.revision();
if (JNIUtil::isExceptionThrown())
Modified: subversion/branches/ev2-export/subversion/bindings/javahl/native/RevpropTable.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/bindings/javahl/native/RevpropTable.cpp?rev=1412731&r1=1412730&r2=1412731&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/branches/ev2-export/subversion/bindings/javahl/native/RevpropTable.cpp Fri Nov 23 01:12:18 2012
@@ -120,8 +120,8 @@ RevpropTable::RevpropTable(jobject jrevp
if (JNIUtil::isExceptionThrown())
return;
- m_revprops[std::string((const char *)propname)]
- = std::string((const char *)propval);
+ m_revprops[std::string(static_cast<const char *>(propname))]
+ = std::string(static_cast<const char *>(propval));
JNIUtil::getEnv()->DeleteLocalRef(jpropval);
}