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 2010/08/11 18:43:31 UTC
svn commit: r984468 [1/25] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/generator/ build/generator/templates/ notes/
notes/tree-conflicts/ notes/wc-ng/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversi...
Author: hwright
Date: Wed Aug 11 16:43:22 2010
New Revision: 984468
URL: http://svn.apache.org/viewvc?rev=984468&view=rev
Log:
On the ignore-mergeinfo branch:
Bring up to date with trunk@984450.
There are still test failures, but they will be addressed in subsequent commits.
Added:
subversion/branches/ignore-mergeinfo/notes/wc-ng/single-db-per-wc
- copied unchanged from r984450, subversion/trunk/notes/wc-ng/single-db-per-wc
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.cpp
- copied unchanged from r984450, subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.h
- copied unchanged from r984450, subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
- copied unchanged from r984450, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
- copied unchanged from r984450, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
- copied unchanged from r984450, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/cleanup.c
- copied unchanged from r984450, subversion/trunk/subversion/libsvn_wc/cleanup.c
subversion/branches/ignore-mergeinfo/subversion/svnrdump/ (props changed)
- copied from r984450, subversion/trunk/subversion/svnrdump/
subversion/branches/ignore-mergeinfo/subversion/svnrdump/dump_editor.c
- copied unchanged from r984450, subversion/trunk/subversion/svnrdump/dump_editor.c
subversion/branches/ignore-mergeinfo/subversion/svnrdump/dump_editor.h
- copied unchanged from r984450, subversion/trunk/subversion/svnrdump/dump_editor.h
subversion/branches/ignore-mergeinfo/subversion/svnrdump/load_editor.c
- copied unchanged from r984450, subversion/trunk/subversion/svnrdump/load_editor.c
subversion/branches/ignore-mergeinfo/subversion/svnrdump/load_editor.h
- copied unchanged from r984450, subversion/trunk/subversion/svnrdump/load_editor.h
subversion/branches/ignore-mergeinfo/subversion/svnrdump/svnrdump.1
- copied unchanged from r984450, subversion/trunk/subversion/svnrdump/svnrdump.1
subversion/branches/ignore-mergeinfo/subversion/svnrdump/svnrdump.c
- copied unchanged from r984450, subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/input_validation_tests.py
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/redirect_tests.py
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/redirect_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnrdump_tests.py
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnrdump_tests_data/
- copied from r984450, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnrdump_tests_data/revision-0.dump
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/revision-0.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnrdump_tests_data/skeleton.dump
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/skeleton.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump
- copied unchanged from r984450, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
- copied unchanged from r984450, subversion/trunk/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
subversion/branches/ignore-mergeinfo/tools/dev/unix-build/README
- copied unchanged from r984450, subversion/trunk/tools/dev/unix-build/README
Removed:
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/log.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/log.h
Modified:
subversion/branches/ignore-mergeinfo/ (props changed)
subversion/branches/ignore-mergeinfo/COMMITTERS
subversion/branches/ignore-mergeinfo/Makefile.in
subversion/branches/ignore-mergeinfo/build.conf
subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/ignore-mergeinfo/build/run_tests.py
subversion/branches/ignore-mergeinfo/configure.ac
subversion/branches/ignore-mergeinfo/gen-make.py
subversion/branches/ignore-mergeinfo/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt
subversion/branches/ignore-mergeinfo/notes/unicode-composition-for-filenames
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ChangelistCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/DiffSummaryCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/PatchCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProplistCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/README
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/svn/delta.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/auth.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/client.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/core.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/delta.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/mergeinfo.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/pool.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/ra.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/repository.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/utils.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/wc.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/ruby/test/test_info.rb
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/svn_delta.i
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_eol_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_fs_util.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_opt_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_wc_private.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_client.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_config.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_diff.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_error.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_error_codes.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_props.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_ra.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_types.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_wc.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/add.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/cat.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/changelist.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/cleanup.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/client.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/cmdline.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/commit_util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/copy.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/delete.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/export.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/externals.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/info.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/list.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/locking_commands.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/log.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/patch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/prop_commands.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/ra.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/relocate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/repos_diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revert.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/switch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/url.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/structure
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/tree.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/compat.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/ra_loader.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/ra_loader.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/wrapper_template.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/fetch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/options.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/props.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/session.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/auth.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/blame.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getdate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/locks.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/log.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/options.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/property.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/replay.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/serf.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/update.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/win32_auth_sspi.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/replay.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/config_win.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/io.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/opt.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/sqlite.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/stream.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/subst.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_crawler.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/copy.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/crop.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/entries.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/lock.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/node.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/props.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/props.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/questions.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/update_editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/upgrade.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc-queries.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db_pdh.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db_private.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/workqueue.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/workqueue.h
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/deadprops.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/update.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/repos.c
subversion/branches/ignore-mergeinfo/subversion/po/fr.po
subversion/branches/ignore-mergeinfo/subversion/svn/add-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/changelist-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/checkout-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/cl.h
subversion/branches/ignore-mergeinfo/subversion/svn/cleanup-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/commit-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/copy-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/delete-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/diff-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/export-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/import-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/info-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/lock-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/log-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/main.c
subversion/branches/ignore-mergeinfo/subversion/svn/merge-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/mkdir-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/move-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/notify.c
subversion/branches/ignore-mergeinfo/subversion/svn/patch-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/propdel-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/propset-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/resolve-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/resolved-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/revert-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/status-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/switch-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/unlock-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/update-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/upgrade-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/util.c
subversion/branches/ignore-mergeinfo/subversion/svnlook/main.c
subversion/branches/ignore-mergeinfo/subversion/svnsync/main.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/README
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/basic_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/cat_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/checkout_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/commit_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/copy_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/davautocheck.sh
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/depth_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/entries-dump.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/entries_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/export_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/lock_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/patch_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/prop_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/resolved_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/revert_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/schedule_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/stat_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/no-author.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/actions.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/factory.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/main.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/tree.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/verify.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/wc.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/switch_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/trans_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/update_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_client/client-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/db-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/pristine-store-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_main.c
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/ignore-mergeinfo/tools/client-side/svn-viewspec.py
subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn
subversion/branches/ignore-mergeinfo/win-tests.py
Propchange: subversion/branches/ignore-mergeinfo/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 11 16:43:22 2010
@@ -17,6 +17,7 @@ autogen-standalone.mk
autom4te.cache
gen-make.opts
tests.log
+fails.log
db4-win32
db
*.o
Propchange: subversion/branches/ignore-mergeinfo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 16:43:22 2010
@@ -10,6 +10,7 @@
/subversion/branches/gnome-keyring:870558-871410
/subversion/branches/http-protocol-v2:874395-876041
/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2779-dev:965496-984198
/subversion/branches/issue-2843-dev:871432-874179
/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
/subversion/branches/issue-3067-deleted-subtrees:873375-874084
@@ -20,6 +21,7 @@
/subversion/branches/kwallet:870785-871314
/subversion/branches/log-g-performance:870941-871032
/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/nfc-nfd-aware-client:870276,870376
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/subtree-mergeinfo:876734-878766
@@ -34,4 +36,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:873097-960000
+/subversion/trunk:873097-984450
Modified: subversion/branches/ignore-mergeinfo/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/COMMITTERS?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] (original)
+++ subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] Wed Aug 11 16:43:22 2010
@@ -1,4 +1,4 @@
-The following people have commit access to the Subversion sources.
+The following people have commit access to the Subversion sources.
Note that this is not a full list of Subversion's authors, however --
for that, you'd need to look over the log messages to see all the
patch contributors.
@@ -29,7 +29,7 @@ Blanket commit access:
jaa Jani Averbach <ja...@iki.fi>
julianfoad Julian Foad <ju...@wandisco.com>
jszakmeister John Szakmeister <jo...@szakmeister.net>
- ehu Erik Hülsmann <e....@gmx.net>
+ ehu Erik Hülsmann <er...@wandisco.com>
breser Ben Reser <be...@reser.org>
maxb Max Bowsher <ma...@ukf.net>
dberlin Daniel Berlin <db...@dberlin.org>
@@ -143,6 +143,7 @@ Commit access for specific areas:
esr Eric S. Raymond <es...@thyrsus.com> (svncutter)
gmcdonald Gavin McDonald <ga...@16degrees.com.au> (build/hudson,
tools/buildbot)
+ artagnon Ramkumar Ramachandra <ar...@gmail.com> (svnrdump, svntest)
Translation of message files:
@@ -178,6 +179,7 @@ giorgio_valoti Giorgio Valoti <giorgio
cacknin Charles Acknin <ch...@gmail.com> (svnpatch-diff
br.)
holden Holden Karau <ho...@pigscanfly.ca> (scheme-bindings br.)
+ stefan2 Stefan Fuhrmann <st...@alice-dsl.de> (performance br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/ignore-mergeinfo/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/Makefile.in?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/Makefile.in (original)
+++ subversion/branches/ignore-mergeinfo/Makefile.in Wed Aug 11 16:43:22 2010
@@ -168,6 +168,8 @@ SVN_ZLIB_INCLUDES = @SVN_ZLIB_INCLUDES@
MKDIR = @MKDIR@
+DOXYGEN = @DOXYGEN@
+
# The EXTRA_ parameters can be used to pass extra flags at 'make' time.
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
@@ -424,9 +426,9 @@ revision-install:
install-static: @INSTALL_STATIC_RULES@
# JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@
+javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
-javahl-compat: javahl-compat-java javahl @JAVAHL_COMPAT_TESTS_TARGET@
+javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
clean-javahl:
rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@
@@ -439,7 +441,7 @@ check-javahl-compat: javahl-compat-tests
@FIX_JAVAHL_LIB@
$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
-check-javahl: javahl
+check-javahl: javahl check-javahl-compat
@FIX_JAVAHL_LIB@
$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
@@ -534,7 +536,7 @@ check-clean:
subversion/tests/libsvn_wc/fake-wc \
subversion/tests/libsvn_client/test-patch* \
subversion/tests/svnserveautocheck.pid \
- tests.log
+ tests.log fails.log
mkdir-init:
@list='$(BUILD_DIRS) $(SCHEMA_DIR) doc'; \
@@ -599,7 +601,7 @@ doc: doc-api doc-javahl
doc-api: mkdir-init
( cd $(top_srcdir) && \
sed "s,\(OUTPUT_DIRECTORY *= *\),\1$(abs_builddir)/," \
- doc/doxygen.conf | doxygen - )
+ doc/doxygen.conf | $(DOXYGEN) - )
# Generate API documentation for the JavaHL package.
doc-javahl:
Modified: subversion/branches/ignore-mergeinfo/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build.conf?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build.conf (original)
+++ subversion/branches/ignore-mergeinfo/build.conf Wed Aug 11 16:43:22 2010
@@ -54,7 +54,7 @@ private-built-includes =
subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_Path.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_Revision.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNAdmin.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_Version.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
@@ -167,6 +167,14 @@ libs = libsvn_wc libsvn_subr apriconv ap
install = bin
manpages = subversion/svnversion/svnversion.1
+[svnrdump]
+description = Subversion remote repository dumper
+type = exe
+path = subversion/svnrdump
+libs = libsvn_client libsvn_ra libsvn_repos libsvn_delta libsvn_subr apr
+install = bin
+manpages = subversion/svnrdump/svnrdump.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -1065,7 +1073,7 @@ libs = libsvn_fs_base libsvn_fs_fs
[__ALL__]
type = project
path = build/win32
-libs = svn svnserve svnadmin svnlook svnversion svndumpfilter
+libs = svn svnserve svnadmin svnlook svnversion svnrdump svndumpfilter
mod_authz_svn mod_dav_svn svnsync
[__ALL_TESTS__]
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_win.py?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_win.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_win.py Wed Aug 11 16:43:22 2010
@@ -34,6 +34,7 @@ import fnmatch
import re
import subprocess
import glob
+import string
import generator.swig.header_wrappers
import generator.swig.checkout_swig_header
import generator.swig.external_runtime
@@ -79,6 +80,7 @@ class GeneratorBase(gen_base.GeneratorBa
self.libintl_path = None
self.zlib_path = 'zlib'
self.openssl_path = None
+ self.jdk_path = None
self.junit_path = None
self.swig_path = None
self.vs_version = '2002'
@@ -126,6 +128,8 @@ class GeneratorBase(gen_base.GeneratorBa
elif opt == '--with-libintl':
self.libintl_path = val
self.enable_nls = 1
+ elif opt == '--with-jdk':
+ self.jdk_path = val
elif opt == '--with-junit':
self.junit_path = val
elif opt == '--with-zlib':
@@ -833,6 +837,11 @@ class WinGeneratorBase(GeneratorBase):
if isinstance(target, gen_base.TargetSWIG):
fakedefines.append("SWIG_GLOBAL")
+ # Expect rb_errinfo() to be avilable in Ruby 1.9+,
+ # rather than ruby_errinfo.
+ if (self.ruby_major_version > 1 or self.ruby_minor_version > 8):
+ fakedefines.extend(["HAVE_RB_ERRINFO"])
+
if cfg == 'Debug':
fakedefines.extend(["_DEBUG","SVN_DEBUG"])
elif cfg == 'Release':
@@ -1207,19 +1216,31 @@ class WinGeneratorBase(GeneratorBase):
"Find the right Ruby library name to link swig bindings with"
self.ruby_includes = []
self.ruby_libdir = None
+ self.ruby_version = None
+ self.ruby_major_version = None
+ self.ruby_minor_version = None
proc = os.popen('ruby -rrbconfig -e ' + escape_shell_arg(
+ "puts Config::CONFIG['ruby_version'];"
"puts Config::CONFIG['LIBRUBY'];"
"puts Config::CONFIG['archdir'];"
"puts Config::CONFIG['libdir'];"), 'r')
try:
- libruby = proc.readline()[:-1]
- if libruby:
- msg = 'Found installed ruby.'
- self.ruby_lib = libruby
- self.ruby_includes.append(proc.readline()[:-1])
- self.ruby_libdir = proc.readline()[:-1]
+ rubyver = proc.readline()[:-1]
+ if rubyver:
+ self.ruby_version = rubyver
+ self.ruby_major_version = string.atoi(self.ruby_version[0])
+ self.ruby_minor_version = string.atoi(self.ruby_version[2])
+ libruby = proc.readline()[:-1]
+ if libruby:
+ msg = 'Found installed ruby %s' % rubyver
+ self.ruby_lib = libruby
+ self.ruby_includes.append(proc.readline()[:-1])
+ self.ruby_libdir = proc.readline()[:-1]
else:
- msg = 'Could not detect Ruby version.'
+ msg = 'Could not detect Ruby version, assuming 1.8.'
+ self.ruby_version = "1.8"
+ self.ruby_major_version = 1
+ self.ruby_minor_version = 8
self.ruby_lib = 'msvcrt-ruby18.lib'
print('%s\n Ruby bindings will be linked with %s\n'
% (msg, self.ruby_lib))
@@ -1242,39 +1263,41 @@ class WinGeneratorBase(GeneratorBase):
pass
def _find_jdk(self):
- self.jdk_path = None
- jdk_ver = None
- try:
+ if not self.jdk_path:
+ jdk_ver = None
try:
- # Python >=3.0
- import winreg
- except ImportError:
- # Python <3.0
- import _winreg as winreg
- key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
+ try:
+ # Python >=3.0
+ import winreg
+ except ImportError:
+ # Python <3.0
+ import _winreg as winreg
+ key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
r"SOFTWARE\JavaSoft\Java Development Kit")
- # Find the newest JDK version.
- num_values = winreg.QueryInfoKey(key)[1]
- for i in range(num_values):
- (name, value, key_type) = winreg.EnumValue(key, i)
- if name == "CurrentVersion":
- jdk_ver = value
- break
-
- # Find the JDK path.
- if jdk_ver is not None:
- key = winreg.OpenKey(key, jdk_ver)
+ # Find the newest JDK version.
num_values = winreg.QueryInfoKey(key)[1]
for i in range(num_values):
(name, value, key_type) = winreg.EnumValue(key, i)
- if name == "JavaHome":
- self.jdk_path = value
+ if name == "CurrentVersion":
+ jdk_ver = value
break
- winreg.CloseKey(key)
- except (ImportError, EnvironmentError):
- pass
- if self.jdk_path:
- print("Found JDK version %s in %s\n" % (jdk_ver, self.jdk_path))
+
+ # Find the JDK path.
+ if jdk_ver is not None:
+ key = winreg.OpenKey(key, jdk_ver)
+ num_values = winreg.QueryInfoKey(key)[1]
+ for i in range(num_values):
+ (name, value, key_type) = winreg.EnumValue(key, i)
+ if name == "JavaHome":
+ self.jdk_path = value
+ break
+ winreg.CloseKey(key)
+ except (ImportError, EnvironmentError):
+ pass
+ if self.jdk_path:
+ print("Found JDK version %s in %s\n" % (jdk_ver, self.jdk_path))
+ else:
+ print("Using JDK in %s\n" % (self.jdk_path))
def _find_swig(self):
# Require 1.3.24. If not found, assume 1.3.25.
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt Wed Aug 11 16:43:22 2010
@@ -67,6 +67,7 @@
<AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
+ <EnableUAC>true</EnableUAC>
[is configs.name "Debug"] <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
[else] <OptimizeReferences>true</OptimizeReferences>
[end] </Link>
Modified: subversion/branches/ignore-mergeinfo/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/run_tests.py?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/run_tests.py (original)
+++ subversion/branches/ignore-mergeinfo/build/run_tests.py Wed Aug 11 16:43:22 2010
@@ -44,7 +44,7 @@ separated list of test numbers; the defa
# A few useful constants
LINE_LENGTH = 40
-import os, sys, subprocess
+import os, re, subprocess, sys
from datetime import datetime
import getopt
@@ -70,7 +70,7 @@ class TestHarness:
'''Test harness for Subversion tests.
'''
- def __init__(self, abs_srcdir, abs_builddir, logfile,
+ def __init__(self, abs_srcdir, abs_builddir, logfile, faillogfile,
base_url=None, fs_type=None, http_library=None,
server_minor_version=None, verbose=None,
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
@@ -91,6 +91,7 @@ class TestHarness:
self.srcdir = abs_srcdir
self.builddir = abs_builddir
self.logfile = logfile
+ self.faillogfile = faillogfile
self.base_url = base_url
self.fs_type = fs_type
self.http_library = http_library
@@ -200,6 +201,27 @@ class TestHarness:
print(' %d test%s FAILED'
% (len(failed_list), 's'*min(len(failed_list) - 1, 1)))
+ # Copy the truly interesting verbose logs to a separate file, for easier
+ # viewing.
+ if xpassed or failed_list:
+ faillog = open(self.faillogfile, 'wb')
+ last_start_lineno = None
+ last_start_re = re.compile('^(FAIL|SKIP|XFAIL|PASS|START|CLEANUP|END):')
+ for lineno, line in enumerate(log_lines):
+ # Iterate the lines. If it ends a test we're interested in, dump that
+ # test to FAILLOG. If it starts a test (at all), remember the line
+ # number (in case we need it later).
+ if line in xpassed or line in failed_list:
+ faillog.write('[[[\n')
+ faillog.writelines(log_lines[last_start_lineno : lineno+1])
+ faillog.write(']]]\n\n')
+ if last_start_re.match(line):
+ last_start_lineno = lineno + 1
+ faillog.close()
+ elif os.path.exists(self.faillogfile):
+ print("WARNING: no failures, but '%s' exists from a previous run."
+ % self.faillogfile)
+
self._close_log()
return failed
@@ -380,10 +402,12 @@ def main():
if log_to_stdout:
logfile = None
+ faillogfile = None
else:
logfile = os.path.abspath('tests.log')
+ faillogfile = os.path.abspath('fails.log')
- th = TestHarness(args[0], args[1], logfile,
+ th = TestHarness(args[0], args[1], logfile, faillogfile,
base_url, fs_type, http_library, server_minor_version,
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing)
Modified: subversion/branches/ignore-mergeinfo/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/configure.ac?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/configure.ac (original)
+++ subversion/branches/ignore-mergeinfo/configure.ac Wed Aug 11 16:43:22 2010
@@ -332,6 +332,21 @@ else
AC_SUBST(TRANG)
fi
+dnl Check for doxygen
+doxygen=yes
+AC_ARG_WITH(doxygen,
+AC_HELP_STRING([--with-doxygen=PATH],
+ [Specify the command to run doxygen]),
+[
+ doxygen="$withval"
+])
+if test "$doxygen" = "yes"; then
+ AC_PATH_PROG(DOXYGEN, doxygen, none)
+else
+ DOXYGEN="$doxygen"
+ AC_SUBST(DOXYGEN)
+fi
+
dnl Check for libraries --------------------
@@ -804,7 +819,10 @@ dnl Use -Wl,--no-undefined during linkin
AC_ARG_ENABLE(disallowing-of-undefined-references,
[AS_HELP_STRING([--enable-disallowing-of-undefined-references],
[Use -Wl,--no-undefined flag during linking of some libraries to disallow undefined references])])
-if test "$enable_disallowing_of_undefined_references" = "yes"; then
+if test "$enable_disallowing_of_undefined_references" != "yes" && test "`uname`" != "Linux"; then
+ enable_disallowing_of_undefined_references="no"
+fi
+if test "$enable_disallowing_of_undefined_references" != "no"; then
AC_MSG_CHECKING([for -Wl,--no-undefined])
old_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--no-undefined"
@@ -818,7 +836,9 @@ if test "$enable_disallowing_of_undefine
done
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([--enable-disallowing-of-undefined-references explicitly requested, but -Wl,--no-undefined not supported])
+ if test "$enable_disallowing_of_undefined_references" = "yes"; then
+ AC_MSG_ERROR([--enable-disallowing-of-undefined-references explicitly requested, but -Wl,--no-undefined not supported])
+ fi
fi
fi
AC_SUBST([libsvn_auth_gnome_keyring_LDFLAGS])
@@ -882,6 +902,9 @@ AS_HELP_STRING([--enable-maintainer-mode
CFLAGS="-Wold-style-definition $CFLAGS_KEEP"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+ CFLAGS="-Wno-system-headers $CFLAGS_KEEP"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+
AC_LANG_POP([C])
CFLAGS="$CFLAGS_KEEP"
fi
@@ -937,16 +960,16 @@ AS_HELP_STRING([--with-editor=PATH],
SVN_LIB_Z
-MOD_ACTIVATION="-a"
+MOD_ACTIVATION=""
AC_ARG_ENABLE(mod-activation,
-AS_HELP_STRING([--disable-mod-activation],
- [Do not enable mod_dav_svn in httpd.conf]),
+AS_HELP_STRING([--enable-mod-activation],
+ [Enable mod_dav_svn in httpd.conf]),
[
- if test "$enableval" = "no" ; then
- MOD_ACTIVATION=""
- AC_MSG_NOTICE([Disabling apache module activation])
- else
+ if test "$enableval" = "yes" ; then
+ MOD_ACTIVATION="-a"
AC_MSG_NOTICE([Enabling apache module activation])
+ else
+ AC_MSG_NOTICE([Disabling apache module activation])
fi
])
AC_SUBST(MOD_ACTIVATION)
Modified: subversion/branches/ignore-mergeinfo/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/gen-make.py?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/gen-make.py (original)
+++ subversion/branches/ignore-mergeinfo/gen-make.py Wed Aug 11 16:43:22 2010
@@ -167,6 +167,9 @@ def _usage_exit():
print(" tell neon to look for ZLib headers and")
print(" libs in DIR")
print("")
+ print(" --with-jdk=DIR")
+ print(" look for the java development kit here")
+ print("")
print(" --with-junit=DIR")
print(" look for the junit jar here")
print(" junit is for testing the java bindings")
@@ -241,6 +244,7 @@ if __name__ == '__main__':
'with-libintl=',
'with-openssl=',
'with-zlib=',
+ 'with-jdk=',
'with-junit=',
'with-swig=',
'with-sqlite=',
Modified: subversion/branches/ignore-mergeinfo/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt (original)
+++ subversion/branches/ignore-mergeinfo/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt Wed Aug 11 16:43:22 2010
@@ -1,6 +1,6 @@
This file describes handling of all add-vs.-add tree conflict situations
-on 2010-jul-01. Maybe someone will update it and put another date here some
-day, maybe not.
+on 2010-jul-20 (previously 2010-jul-01, r959735). Maybe someone will update it
+and put another date here some day, maybe not.
Add-vs.-add tree conflicts handling introduces a new meaning for
svn_wc__db_status_not_present. Apart from the usual "node deleted and
@@ -23,34 +23,32 @@ all add-vs.-add | incoming ADD of a
tree conflict | file | symlink | dir (2) | file | symlink | dir (2) |
situations |co up sw |co up sw |co up sw |co up sw |co up sw |co up sw |
------------------+---------+---------+---------+---------+---------+---------+
-locally file |?C*?C*?C*|?C*?C*?C*|:( :( :( |?C*?C*?C*|?C*?C*?C*|:( :( :( |
-UNVER- symlink |?C*?C*?C*|?C*?C*?C*|:( :( :( |?C*?C*?C*|?C*?C*?C*|:( :( :( |
-SIONED dir |?C*?C*?C*|?C*?C*?C*|:( :( :( |?C*?C*?C*|?C*?C*?C*|:( :( :( |
+locally file |?C*?C*?C*|?C*?C*?C*|?C+?C+?C+|?C*?C*?C*|?C*?C*?C*|?C+?C+?C+|
+UNVER- symlink |?C*?C*?C*|?C*?C*?C*|?C+?C+?C+|?C*?C*?C*|?C*?C*?C*|?C+?C+?C+|
+SIONED dir |?C*?C*?C*|?C*?C*?C*|?C+?C+?C+|?C*?C*?C*|?C*?C*?C*|?C+?C+?C+|
------------------+---------+---------+---------+---------+---------+---------+
locally file |Ex Ex RC*|RC*RC*RC*|:( :( :( |Ex RC*RC*|RC*RC*RC*|:( :( :( |
ADDED symlink |RC*RC*RC*|Ex Ex RC*|:( :( :( |RC*RC*RC*|Ex RC*RC*|:( :( :( |
- (3) dir |:( :( :( |:( :( :( |Ex Ex Ex |:( :( :( |:( :( :( |Ex Ex Ex |
+ (2) dir |:( :( :( |:( :( :( |Ex Ex Ex |:( :( :( |:( :( :( |Ex Ex Ex |
------------------+---------+---------+---------+---------+---------+---------+
DIFFERENT file |RC*RC*RC*|RC*RC*RC*|:( :( :( |RC*RC*RC*|RC*RC*RC*|:( :( :( |
COPY symlink |RC*RC*RC*|RC*RC*RC*|:( :( :( |RC*RC*RC*|RC*RC*RC*|:( :( :( |
-of a (3) dir |:( :( :( |:( :( :( |AC AC AC |:( :( :( |:( :( :( |AC AC AC |
+of a (2) dir |:( :( :( |:( :( :( |AC AC AC |:( :( :( |:( :( :( |AC AC AC |
------------------+---------+---------+---------+---------+---------+---------+
IDENTICAL file | |RC*Ex*RC*| | |
COPY of symlink | (see above) | |RC*Ex*RC*| |
-a (1) (3) dir | | | |AC AC AC |
+a (1) (2) dir | | | |AC AC AC |
-"*" The cases most recently changed are marked with a * on their right.
+"*" The cases changed in r959735 marked with a * on their right.
+"+" The cases most recently changed are marked with a + on their right.
(1) Where both local and incoming are copies and both copies are from the
exact same copyfrom URL@REV, the node kinds must also match. The colums
against incoming simple-add are identical to "different copy" and omitted.
-(2) Since this patch only modifies add_file() and close_file() for starters,
-these columns are not affected by this patch.
-
-(3) Since we can only deal with replace-by-different-kind properly after we
-moved to single-db, these rows are not affected by this patch.
+(2) Since we can only deal with replace-by-different-kind properly after we
+moved to single-db, some of these rows/columns are still ':(' or 'AC'.
In the table above, each cell shows three letter pairs for,
@@ -91,7 +89,7 @@ The letter pairs are:
So "Ex Ex RC*" would mean:
"During checkout and update, the local add is merged with the incoming add.
During switch, an easily resolvable tree conflict is flagged.
- This patch only changes the 'switch' behavior."
+ r959735 only changes the 'switch' behavior."
A note on checkout: It *is* possible to checkout a URL onto a working copy of
the same URL, which can have local adds scheduled. Then, checkout presumably
Modified: subversion/branches/ignore-mergeinfo/notes/unicode-composition-for-filenames
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/notes/unicode-composition-for-filenames?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/notes/unicode-composition-for-filenames (original)
+++ subversion/branches/ignore-mergeinfo/notes/unicode-composition-for-filenames Wed Aug 11 16:43:22 2010
@@ -251,6 +251,32 @@ Implementing option (4) means:
communicate with the server.
+The above means the client has to be very carefull to preserve the
+encoding from the server and use that when talking to the server
+otherwise the server may not recognize the path as a versioned entity.
+
+Locally however, we can't be sure the filesystem enforces the encoding
+the server sent to the client, meaning there are (contrived) cases where
+a file exists in a different encoding locally than in the repository.
+Which means we have to be very carefull about how we find our files and
+to use the encoding we got from the local filesystem.
+
+Implementation details:
+
+ * The hash keys in svn_wc_adm_access_t's are hashed on the normalized
+ path encoding, not the repository path, in order to be able to
+ calculate the hash key from both the wc path as well as the repo path
+ * The same line of reasoning applies to the hash keys in the entries hash
+
+New conventions:
+ * variables containing a path as encoded in the local filesystem
+ should contain the (sub)string 'wc_path'
+ * variables containing a path as encoded in the repository should
+ contain the (sub)string 'repo_path'
+
+
+
+
References
==========
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp Wed Aug 11 16:43:22 2010
@@ -349,6 +349,62 @@ CreateJ::Lock(const svn_lock_t *lock)
}
jobject
+CreateJ::ChangedPath(const char *path, svn_log_changed_path2_t *log_item)
+{
+ JNIEnv *env = JNIUtil::getEnv();
+
+ // Create a local frame for our references
+ env->PushLocalFrame(LOCAL_FRAME_SIZE);
+ if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
+
+ jclass clazzCP = env->FindClass(JAVA_PACKAGE"/ChangePath");
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN(SVN_NO_ERROR);
+
+ static jmethodID midCP = 0;
+ if (midCP == 0)
+ {
+ midCP = env->GetMethodID(clazzCP,
+ "<init>",
+ "(Ljava/lang/String;JLjava/lang/String;"
+ "L"JAVA_PACKAGE"/ChangePath$Action;"
+ "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/Tristate;"
+ "L"JAVA_PACKAGE"/Tristate;)V");
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN(SVN_NO_ERROR);
+ }
+
+ jstring jpath = JNIUtil::makeJString(path);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
+ jstring jcopyFromPath = JNIUtil::makeJString(log_item->copyfrom_path);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
+ jobject jaction = EnumMapper::mapChangePathAction(log_item->action);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
+ jobject jnodeKind = EnumMapper::mapNodeKind(log_item->node_kind);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
+ jlong jcopyFromRev = log_item->copyfrom_rev;
+
+ jobject jcp = env->NewObject(clazzCP, midCP, jpath, jcopyFromRev,
+ jcopyFromPath, jaction, jnodeKind,
+ EnumMapper::mapTristate(log_item->text_modified),
+ EnumMapper::mapTristate(log_item->props_modified));
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
+
+ return env->PopLocalFrame(jcp);
+}
+
+jobject
CreateJ::Status(svn_wc_context_t *wc_ctx, const char *local_abspath,
const svn_client_status_t *status, apr_pool_t *pool)
{
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h Wed Aug 11 16:43:22 2010
@@ -52,6 +52,9 @@ class CreateJ
Lock(const svn_lock_t *lock);
static jobject
+ ChangedPath(const char *path, svn_log_changed_path2_t *log_item);
+
+ static jobject
Status(svn_wc_context_t *wc_ctx, const char *local_abspath,
const svn_client_status_t *status, apr_pool_t *pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp Wed Aug 11 16:43:22 2010
@@ -58,6 +58,23 @@ jint EnumMapper::mapCommitMessageStateFl
return jstateFlags;
}
+jobject EnumMapper::mapChangePathAction(const char action)
+{
+ switch (action)
+ {
+ case 'A':
+ return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 0);
+ case 'D':
+ return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 1);
+ case 'R':
+ return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 2);
+ case 'M':
+ return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 3);
+ default:
+ return NULL;
+ }
+}
+
/**
* Map a C notify state constant to the Java constant.
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h Wed Aug 11 16:43:22 2010
@@ -51,6 +51,7 @@ class EnumMapper
/* Converting from C enum's */
static jint mapCommitMessageStateFlags(apr_byte_t flags);
+ static jobject mapChangePathAction(const char action);
static jobject mapNotifyState(svn_wc_notify_state_t state);
static jobject mapNotifyAction(svn_wc_notify_action_t action);
static jobject mapReposNotifyNodeAction(svn_node_action action);
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp Wed Aug 11 16:43:22 2010
@@ -91,23 +91,6 @@ LogMessageCallback::singleMessage(svn_lo
POP_AND_RETURN(SVN_NO_ERROR);
}
- jclass clazzCP = env->FindClass(JAVA_PACKAGE"/ChangePath");
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
-
- static jmethodID midCP = 0;
- if (midCP == 0)
- {
- midCP = env->GetMethodID(clazzCP,
- "<init>",
- "(Ljava/lang/String;JLjava/lang/String;C"
- "L"JAVA_PACKAGE"/NodeKind;"
- "L"JAVA_PACKAGE"/Tristate;"
- "L"JAVA_PACKAGE"/Tristate;)V");
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
- }
-
jobject jChangedPaths = NULL;
if (log_entry->changed_paths)
{
@@ -122,33 +105,9 @@ LogMessageCallback::singleMessage(svn_lo
svn_log_changed_path2_t *log_item =
(svn_log_changed_path2_t *) svn__apr_hash_index_val(hi);
- jstring jpath = JNIUtil::makeJString(path);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
-
- jstring jcopyFromPath = JNIUtil::makeJString(log_item->copyfrom_path);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
-
- jobject jnodeKind = EnumMapper::mapNodeKind(log_item->node_kind);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
-
- jlong jcopyFromRev = log_item->copyfrom_rev;
- jchar jaction = log_item->action;
-
- jobject cp = env->NewObject(clazzCP, midCP, jpath, jcopyFromRev,
- jcopyFromPath, jaction, jnodeKind,
- EnumMapper::mapTristate(log_item->text_modified),
- EnumMapper::mapTristate(log_item->props_modified));
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
+ jobject cp = CreateJ::ChangedPath(path, log_item);
jcps.push_back(cp);
-
- env->DeleteLocalRef(jnodeKind);
- env->DeleteLocalRef(jpath);
- env->DeleteLocalRef(jcopyFromPath);
}
jChangedPaths = CreateJ::Set(jcps);
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp Wed Aug 11 16:43:22 2010
@@ -58,7 +58,7 @@ void MessageReceiver::receiveMessage(con
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/SVNAdmin$MessageReceiver");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/ISVNAdmin$MessageReceiver");
if (JNIUtil::isJavaExceptionThrown())
return;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp Wed Aug 11 16:43:22 2010
@@ -68,6 +68,52 @@
#include <iostream>
#include <sstream>
+class CommitNotifier
+{
+ public:
+ CommitNotifier(SVN::Pool &inPool)
+ : pool(inPool), info(NULL)
+ {
+ ;
+ }
+
+ static svn_error_t *callback(const svn_commit_info_t *commit_info,
+ void *baton,
+ apr_pool_t *pool)
+ {
+ if (baton)
+ return ((CommitNotifier *)baton)->stashInfo(commit_info);
+
+ return SVN_NO_ERROR;
+ }
+
+ long getRevnum()
+ {
+ if (info && SVN_IS_VALID_REVNUM(info->revision))
+ return info->revision;
+
+ return SVN_INVALID_REVNUM;
+ }
+
+ /* Special operator new to allocate this thing in a pool. */
+ void * operator new(size_t sz, SVN::Pool &pool)
+ {
+ void *ptr = apr_pcalloc(pool.pool(), sizeof(CommitNotifier));
+ return ptr;
+ }
+
+ protected:
+ svn_error_t *stashInfo(const svn_commit_info_t *commit_info)
+ {
+ info = svn_commit_info_dup(commit_info, pool.pool());
+ return SVN_NO_ERROR;
+ }
+
+ private:
+ SVN::Pool &pool;
+ svn_commit_info_t *info;
+};
+
struct log_msg_baton
{
const char *message;
@@ -314,7 +360,6 @@ void SVNClient::setProgressListener(Prog
void SVNClient::remove(Targets &targets, const char *message, bool force,
bool keep_local, RevpropTable &revprops)
{
- svn_commit_info_t *commit_info = NULL;
SVN::Pool requestPool;
svn_client_ctx_t *ctx = getContext(message);
if (ctx == NULL)
@@ -323,7 +368,7 @@ void SVNClient::remove(Targets &targets,
const apr_array_header_t *targets2 = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), );
- SVN_JNI_ERR(svn_client_delete3(&commit_info, targets2, force, keep_local,
+ SVN_JNI_ERR(svn_client_delete4(targets2, force, keep_local,
revprops.hash(requestPool), ctx,
requestPool.pool()), );
}
@@ -411,24 +456,20 @@ jlong SVNClient::commit(Targets &targets
StringArray &changelists, RevpropTable &revprops)
{
SVN::Pool requestPool;
- svn_commit_info_t *commit_info = NULL;
const apr_array_header_t *targets2 = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), -1);
svn_client_ctx_t *ctx = getContext(message);
if (ctx == NULL)
return SVN_INVALID_REVNUM;
- SVN_JNI_ERR(svn_client_commit4(&commit_info, targets2, depth,
+ SVN_JNI_ERR(svn_client_commit5(targets2, depth,
noUnlock, keepChangelist,
changelists.array(requestPool),
revprops.hash(requestPool), ctx,
requestPool.pool()),
SVN_INVALID_REVNUM);
- if (commit_info && SVN_IS_VALID_REVNUM(commit_info->revision))
- return commit_info->revision;
-
- return SVN_INVALID_REVNUM;
+ return ((CommitNotifier *)ctx->commit_baton)->getRevnum();
}
void SVNClient::copy(CopySources ©Sources, const char *destPath,
@@ -452,8 +493,7 @@ void SVNClient::copy(CopySources ©So
if (ctx == NULL)
return;
- svn_commit_info_t *commit_info;
- SVN_JNI_ERR(svn_client_copy5(&commit_info, srcs, destinationPath.c_str(),
+ SVN_JNI_ERR(svn_client_copy6(srcs, destinationPath.c_str(),
copyAsChild, makeParents, ignoreExternals,
revprops.hash(requestPool), ctx,
requestPool.pool()), );
@@ -475,8 +515,7 @@ void SVNClient::move(Targets &srcPaths,
if (ctx == NULL)
return;
- svn_commit_info_t *commit_info;
- SVN_JNI_ERR(svn_client_move5(&commit_info, (apr_array_header_t *) srcs,
+ SVN_JNI_ERR(svn_client_move6((apr_array_header_t *) srcs,
destinationPath.c_str(), force, moveAsChild,
makeParents, revprops.hash(requestPool), ctx,
requestPool.pool()), );
@@ -486,7 +525,6 @@ void SVNClient::mkdir(Targets &targets,
RevpropTable &revprops)
{
SVN::Pool requestPool;
- svn_commit_info_t *commit_info = NULL;
svn_client_ctx_t *ctx = getContext(message);
if (ctx == NULL)
return;
@@ -494,7 +532,7 @@ void SVNClient::mkdir(Targets &targets,
const apr_array_header_t *targets2 = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), );
- SVN_JNI_ERR(svn_client_mkdir3(&commit_info, targets2, makeParents,
+ SVN_JNI_ERR(svn_client_mkdir4(targets2, makeParents,
revprops.hash(requestPool), ctx,
requestPool.pool()), );
}
@@ -606,14 +644,12 @@ void SVNClient::doImport(const char *pat
Path intUrl(url);
SVN_JNI_ERR(intUrl.error_occured(), );
- svn_commit_info_t *commit_info = NULL;
svn_client_ctx_t *ctx = getContext(message);
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_import3(&commit_info, intPath.c_str(),
- intUrl.c_str(), depth, noIgnore,
- ignoreUnknownNodeTypes,
+ SVN_JNI_ERR(svn_client_import4(intPath.c_str(), intUrl.c_str(), depth,
+ noIgnore, ignoreUnknownNodeTypes,
revprops.hash(requestPool), ctx,
requestPool.pool()), );
}
@@ -932,7 +968,6 @@ void SVNClient::propertySet(const char *
else
val = svn_string_create(value, requestPool.pool());
- svn_commit_info_t *commit_info = NULL;
Path intPath(path);
SVN_JNI_ERR(intPath.error_occured(), );
@@ -940,7 +975,7 @@ void SVNClient::propertySet(const char *
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_propset3(&commit_info, name, val, intPath.c_str(),
+ SVN_JNI_ERR(svn_client_propset4(name, val, intPath.c_str(),
depth, force, SVN_INVALID_REVNUM,
changelists.array(requestPool),
revprops.hash(requestPool),
@@ -1144,7 +1179,8 @@ SVNClient::diffSummarize(const char *tar
svn_client_ctx_t *SVNClient::getContext(const char *message)
{
- apr_pool_t *pool = JNIUtil::getRequestPool()->pool();
+ SVN::Pool *requestPool = JNIUtil::getRequestPool();
+ apr_pool_t *pool = requestPool->pool();
svn_auth_baton_t *ab;
svn_client_ctx_t *ctx;
SVN_JNI_ERR(svn_client_create_context(&ctx, pool), NULL);
@@ -1240,6 +1276,9 @@ svn_client_ctx_t *SVNClient::getContext(
ctx->progress_func = ProgressListener::progress;
ctx->progress_baton = m_progressListener;
+ ctx->commit_callback2 = CommitNotifier::callback;
+ ctx->commit_baton = new (*requestPool) CommitNotifier(*requestPool);
+
if (m_conflictResolver)
{
ctx->conflict_func = ConflictResolverCallback::resolveConflict;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java Wed Aug 11 16:43:22 2010
@@ -43,7 +43,7 @@ public class ChangePath implements java.
* @param nodeKind the kind of the changed path
*/
public ChangePath(String path, long copySrcRevision, String copySrcPath,
- char action, NodeKind nodeKind, Tristate textMods,
+ Action action, NodeKind nodeKind, Tristate textMods,
Tristate propMods)
{
this.path = path;
@@ -65,7 +65,7 @@ public class ChangePath implements java.
private String copySrcPath;
/** 'A'dd, 'D'elete, 'R'eplace, 'M'odify */
- private char action;
+ private Action action;
/** The kind of the changed path. */
private NodeKind nodeKind;
@@ -107,7 +107,7 @@ public class ChangePath implements java.
* Retrieve action performed
* @return action performed
*/
- public char getAction()
+ public Action getAction()
{
return action;
}
@@ -138,4 +138,22 @@ public class ChangePath implements java.
{
return propMods;
}
+
+ /**
+ * Actions which may have occurred to this path.
+ */
+ public enum Action
+ {
+ /** Path was added. */
+ add,
+
+ /** Path was deleted. */
+ delete,
+
+ /** Path was replaced. */
+ replace,
+
+ /** Path was modified. */
+ modify;
+ }
}
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Wed Aug 11 16:43:22 2010
@@ -25,10 +25,11 @@ package org.apache.subversion.javahl;
import java.util.Map;
import java.util.EventObject;
+import org.apache.subversion.javahl.callback.ClientNotifyCallback;
/**
- * The event passed to the {@link Notify2#onNotify(NotifyInformation)}
- * API to notify {@link SVNClientInterface} of relevant events.
+ * The event passed to the {@link ClientNotifyCallback#onNotify}
+ * API to notify {@link ISVNClient} of relevant events.
*
* @since 1.2
*/
@@ -44,7 +45,7 @@ public class ClientNotifyInformation ext
private static final long serialVersionUID = 1L;
/**
- * The {@link NotifyAction} which triggered this event.
+ * The {@link Action} which triggered this event.
*/
private Action action;
@@ -69,12 +70,12 @@ public class ClientNotifyInformation ext
private String errMsg;
/**
- * The {@link NotifyStatus} of the content of the item.
+ * The {@link Status} of the content of the item.
*/
private Status contentState;
/**
- * The {@link NotifyStatus} of the properties of the item.
+ * The {@link Status} of the properties of the item.
*/
private Status propState;
@@ -128,14 +129,14 @@ public class ClientNotifyInformation ext
* This constructor is to be used by the native code.
*
* @param path The path of the item, which is the source of the event.
- * @param action The {@link NotifyAction} which triggered this event.
+ * @param action The {@link Action} which triggered this event.
* @param kind The {@link NodeKind} of the item.
* @param mimeType The MIME type of the item.
* @param lock Any lock for the item.
* @param errMsg Any error message for the item.
- * @param contentState The {@link NotifyStatus} of the content of
+ * @param contentState The {@link Status} of the content of
* the item.
- * @param propState The {@link NotifyStatus} of the properties of
+ * @param propState The {@link Status} of the properties of
* the item.
* @param lockState The {@link LockStatus} of the lock of the item.
* @param revision The revision of the item.
@@ -187,7 +188,7 @@ public class ClientNotifyInformation ext
}
/**
- * @return The {@link NotifyAction} which triggered this event.
+ * @return The {@link Action} which triggered this event.
*/
public Action getAction()
{
@@ -227,7 +228,7 @@ public class ClientNotifyInformation ext
}
/**
- * @return The {@link NotifyStatus} of the content of the item.
+ * @return The {@link Status} of the content of the item.
*/
public Status getContentState()
{
@@ -235,7 +236,7 @@ public class ClientNotifyInformation ext
}
/**
- * @return The {@link NotifyStatus} of the properties of the item.
+ * @return The {@link Status} of the properties of the item.
*/
public Status getPropState()
{
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java Wed Aug 11 16:43:22 2010
@@ -24,11 +24,11 @@
package org.apache.subversion.javahl;
import java.util.EventObject;
+import org.apache.subversion.javahl.callback.DiffSummaryCallback;
/**
- * The event passed to the {@link
- * DiffSummaryReceiver#onSummary(DiffSummary)} API in response to path
- * differences reported by {@link SVNClientInterface#diffSummarize}.
+ * The event passed to the {@link DiffSummaryCallback#onSummary} API
+ * in response to path differences reported by {@link ISVNClient#diffSummarize}.
*
* @since 1.5
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java Wed Aug 11 16:43:22 2010
@@ -26,7 +26,7 @@ package org.apache.subversion.javahl;
import java.util.Date;
/**
- * A general subversion directory entry. Used for SVNClientInterface.list
+ * A general subversion directory entry. Used for {@link ISVNClient#list}.
*/
public class DirEntry implements java.io.Serializable
{
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Wed Aug 11 16:43:22 2010
@@ -620,11 +620,11 @@ public interface ISVNClient
*
* @param target Path or URL.
* @param pegRevision Revision at which to interpret
- * <code>target</code>. If {@link RevisionKind#unspecified} or
+ * <code>target</code>. If {@link Revision.Kind#unspecified} or
* <code>null</code>, behave identically to {@link
- * #diffSummarize(String, Revision, String, Revision, int,
- * boolean, DiffSummaryCallback)}, using <code>path</code> for
- * both of that method's targets.
+ * #diffSummarize(String, Revision, String, Revision, Depth,
+ * Collection, boolean, DiffSummaryCallback)}, using
+ * <code>path</code> for both of that method's targets.
* @param startRevision Beginning of range for comparsion of
* <code>target</code>.
* @param endRevision End of range for comparsion of
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java Wed Aug 11 16:43:22 2010
@@ -26,7 +26,7 @@ package org.apache.subversion.javahl;
import java.util.Date;
/**
- * this class is returned by SVNClientInterface.info2 and contains information
+ * this class is returned by {@link ISVNClient#info2} and contains information
* about items in the repository or working copy
* @since 1.2
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java?rev=984468&r1=984467&r2=984468&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java Wed Aug 11 16:43:22 2010
@@ -23,10 +23,11 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.callback.ProgressCallback;
+
/**
- * The event passed to the {@link
- * ProgressListener#onProgress(ProgressEvent)} API to inform {@link
- * SVNClientInterface} of command progress (in terms of bytes).
+ * The event passed to the {@link ProgressCallback#onProgress} API to inform
+ * {@link ISVNClient} of command progress (in terms of bytes).
*
* @since 1.5
*/