You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/03/30 22:58:01 UTC
svn commit: r929279 [1/20] - in /subversion/branches/svn-patch-improvements:
./ build/ac-macros/ build/generator/ build/generator/templates/
contrib/client-side/emacs/ notes/feedback/ notes/meetings/ notes/wc-ng/
subversion/ subversion/bindings/javahl/...
Author: dannas
Date: Tue Mar 30 20:57:53 2010
New Revision: 929279
URL: http://svn.apache.org/viewvc?rev=929279&view=rev
Log:
Sync svn-patch-improvements branch with trunk.
Added:
subversion/branches/svn-patch-improvements/notes/feedback/cmpilato-user-calls
- copied unchanged from r929258, subversion/trunk/notes/feedback/cmpilato-user-calls
subversion/branches/svn-patch-improvements/notes/wc-ng/conflict-storage
- copied unchanged from r929258, subversion/trunk/notes/wc-ng/conflict-storage
subversion/branches/svn-patch-improvements/notes/wc-ng/conflict-ui
- copied unchanged from r929258, subversion/trunk/notes/wc-ng/conflict-ui
subversion/branches/svn-patch-improvements/notes/wc-ng/use-of-tmp-text-base-path
- copied unchanged from r929258, subversion/trunk/notes/wc-ng/use-of-tmp-text-base-path
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Array.cpp
- copied unchanged from r929258, subversion/trunk/subversion/bindings/javahl/native/Array.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Array.h
- copied unchanged from r929258, subversion/trunk/subversion/bindings/javahl/native/Array.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
- copied unchanged from r929258, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java
- copied unchanged from r929258, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/svnadmin_tests_data/mergeinfo_included_partial.dump
- copied unchanged from r929258, subversion/trunk/subversion/tests/cmdline/svnadmin_tests_data/mergeinfo_included_partial.dump
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/svnadmin_tests_data/skeleton_repos.dump
- copied unchanged from r929258, subversion/trunk/subversion/tests/cmdline/svnadmin_tests_data/skeleton_repos.dump
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/upgrade_tests_data/upgrade_with_externals.tar.bz2
- copied unchanged from r929258, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_with_externals.tar.bz2
Removed:
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Notify.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Notify.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientLogLevel.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/LockStatus.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Notify.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyAction.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyStatus.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Operation.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionKind.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ScheduleKind.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/StatusKind.java
subversion/branches/svn-patch-improvements/subversion/include/private/svn_diff_private.h
Modified:
subversion/branches/svn-patch-improvements/ (props changed)
subversion/branches/svn-patch-improvements/CHANGES
subversion/branches/svn-patch-improvements/COMMITTERS
subversion/branches/svn-patch-improvements/Makefile.in
subversion/branches/svn-patch-improvements/build.conf
subversion/branches/svn-patch-improvements/build/ac-macros/swig.m4
subversion/branches/svn-patch-improvements/build/generator/gen_vcnet_vcproj.py
subversion/branches/svn-patch-improvements/build/generator/gen_win.py
subversion/branches/svn-patch-improvements/build/generator/neon.vcxproj.ezt
subversion/branches/svn-patch-improvements/build/generator/serf.vcxproj.ezt
subversion/branches/svn-patch-improvements/build/generator/svn_config.vcxproj.ezt
subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/svn-patch-improvements/build/generator/zlib.vcxproj.ezt
subversion/branches/svn-patch-improvements/contrib/client-side/emacs/dsvn.el
subversion/branches/svn-patch-improvements/notes/meetings/svn-vision-agenda
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CommitMessage.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CopySources.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/EnumMapper.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/InfoCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/InfoCallback.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/JNIThreadData.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/NotifyCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ProgressListener.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Revision.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/RevisionRange.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/RevpropTable.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/SVNAdmin.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/SVNAdmin.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/StatusCallback.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/StringArray.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/StringArray.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Targets.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/Targets.h
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Depth.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Revision.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DiffSummary.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/svn-patch-improvements/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/branches/svn-patch-improvements/subversion/bindings/swig/INSTALL
subversion/branches/svn-patch-improvements/subversion/bindings/swig/NOTES
subversion/branches/svn-patch-improvements/subversion/bindings/swig/core.i
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/auth.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/client.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/core.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/delta.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/mergeinfo.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/pool.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/ra.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/repository.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/run_all.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/python/tests/wc.py
subversion/branches/svn-patch-improvements/subversion/bindings/swig/ruby/svn/wc.rb
subversion/branches/svn-patch-improvements/subversion/bindings/swig/ruby/test/test_core.rb
subversion/branches/svn-patch-improvements/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/svn-patch-improvements/subversion/bindings/swig/svn_diff.i
subversion/branches/svn-patch-improvements/subversion/include/mod_dav_svn.h
subversion/branches/svn-patch-improvements/subversion/include/private/svn_cmdline_private.h
subversion/branches/svn-patch-improvements/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/svn-patch-improvements/subversion/include/private/svn_opt_private.h
subversion/branches/svn-patch-improvements/subversion/include/private/svn_skel.h
subversion/branches/svn-patch-improvements/subversion/include/private/svn_sqlite.h
subversion/branches/svn-patch-improvements/subversion/include/private/svn_wc_private.h
subversion/branches/svn-patch-improvements/subversion/include/svn_auth.h
subversion/branches/svn-patch-improvements/subversion/include/svn_client.h
subversion/branches/svn-patch-improvements/subversion/include/svn_delta.h
subversion/branches/svn-patch-improvements/subversion/include/svn_diff.h
subversion/branches/svn-patch-improvements/subversion/include/svn_dirent_uri.h
subversion/branches/svn-patch-improvements/subversion/include/svn_fs.h
subversion/branches/svn-patch-improvements/subversion/include/svn_io.h
subversion/branches/svn-patch-improvements/subversion/include/svn_mergeinfo.h
subversion/branches/svn-patch-improvements/subversion/include/svn_opt.h
subversion/branches/svn-patch-improvements/subversion/include/svn_ra.h
subversion/branches/svn-patch-improvements/subversion/include/svn_ra_svn.h
subversion/branches/svn-patch-improvements/subversion/include/svn_repos.h
subversion/branches/svn-patch-improvements/subversion/include/svn_sorts.h
subversion/branches/svn-patch-improvements/subversion/include/svn_string.h
subversion/branches/svn-patch-improvements/subversion/include/svn_types.h
subversion/branches/svn-patch-improvements/subversion/include/svn_wc.h
subversion/branches/svn-patch-improvements/subversion/libsvn_client/add.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/blame.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/cat.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/cleanup.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/client.h
subversion/branches/svn-patch-improvements/subversion/libsvn_client/commit.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/commit_util.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/copy.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/deprecated.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/diff.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/export.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/externals.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/info.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/locking_commands.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/merge.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/mergeinfo.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/mergeinfo.h
subversion/branches/svn-patch-improvements/subversion/libsvn_client/patch.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/prop_commands.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/ra.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/repos_diff.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/revert.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/switch.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/update.c
subversion/branches/svn-patch-improvements/subversion/libsvn_client/util.c
subversion/branches/svn-patch-improvements/subversion/libsvn_delta/compat.c
subversion/branches/svn-patch-improvements/subversion/libsvn_delta/compose_delta.c
subversion/branches/svn-patch-improvements/subversion/libsvn_delta/path_driver.c
subversion/branches/svn-patch-improvements/subversion/libsvn_diff/diff.h
subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs/fs-loader.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs/fs-loader.h
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/bdb/changes-table.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/obliterate.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/reps-strings.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/revs-txns.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/revs-txns.h
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/tree.h
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_base/util/fs_skels.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/caching.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/dag.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/fs.h
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/lock.c
subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs/tree.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra/compat.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra/ra_loader.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra/ra_loader.h
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_local/split_url.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_neon/get_locations.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_neon/log.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_neon/props.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_neon/session.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_serf/auth_kerb.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_serf/auth_kerb.h
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_serf/update.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_svn/client.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_svn/editorp.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_svn/internal_auth.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_svn/marshal.c
subversion/branches/svn-patch-improvements/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/commit.c
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/fs-wrap.c
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/load.c
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/log.c
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/reporter.c
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/repos.c
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/repos.h
subversion/branches/svn-patch-improvements/subversion/libsvn_repos/rev_hunt.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/atomic.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/auth.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/cmdline.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/deprecated.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/io.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/iter.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/mergeinfo.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/opt.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/prompt.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/quoprint.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/simple_providers.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/skel.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/sorts.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/stream.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/subst.c
subversion/branches/svn-patch-improvements/subversion/libsvn_subr/svn_string.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/adm_crawler.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/adm_files.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/adm_files.h
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/adm_ops.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/conflicts.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/copy.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/deprecated.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/diff.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/entries.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/lock.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/lock.h
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/log.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/log.h
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/merge.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/old-and-busted.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/props.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/props.h
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/questions.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/relocate.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/revision_status.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/status.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/translate.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/update_editor.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/upgrade.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/util.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/wc-queries.sql
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/wc.h
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/wc_db.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/wc_db.h
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/workqueue.c
subversion/branches/svn-patch-improvements/subversion/libsvn_wc/workqueue.h
subversion/branches/svn-patch-improvements/subversion/mod_dav_svn/dav_svn.h
subversion/branches/svn-patch-improvements/subversion/mod_dav_svn/mirror.c
subversion/branches/svn-patch-improvements/subversion/mod_dav_svn/util.c
subversion/branches/svn-patch-improvements/subversion/po/fr.po
subversion/branches/svn-patch-improvements/subversion/svn/cl.h
subversion/branches/svn-patch-improvements/subversion/svn/log-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/main.c
subversion/branches/svn-patch-improvements/subversion/svn/mergeinfo-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/notify.c
subversion/branches/svn-patch-improvements/subversion/svn/patch-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/propget-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/props.c
subversion/branches/svn-patch-improvements/subversion/svn/propset-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/status-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/switch-cmd.c
subversion/branches/svn-patch-improvements/subversion/svn/util.c
subversion/branches/svn-patch-improvements/subversion/svn_private_config.hw
subversion/branches/svn-patch-improvements/subversion/svnadmin/main.c
subversion/branches/svn-patch-improvements/subversion/svndumpfilter/main.c
subversion/branches/svn-patch-improvements/subversion/svnlook/main.c
subversion/branches/svn-patch-improvements/subversion/svnserve/serve.c
subversion/branches/svn-patch-improvements/subversion/svnsync/main.c
subversion/branches/svn-patch-improvements/subversion/svnsync/sync.c
subversion/branches/svn-patch-improvements/subversion/svnversion/main.c
subversion/branches/svn-patch-improvements/subversion/tests/README
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/checkout_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/commit_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/copy_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/depth_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/export_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/lock_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/log_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/merge_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/patch_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/prop_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/revert_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/svntest/actions.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/svntest/verify.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/switch_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/update_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_client/ (props changed)
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_client/client-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_fs_base/changes-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_wc/db-test.c
subversion/branches/svn-patch-improvements/subversion/tests/libsvn_wc/tree-conflict-data-test.c
subversion/branches/svn-patch-improvements/tools/dev/analyze-svnlogs.py
subversion/branches/svn-patch-improvements/tools/dev/unix-build/Makefile.svn
subversion/branches/svn-patch-improvements/tools/dist/construct-rolling-environment.sh
subversion/branches/svn-patch-improvements/tools/dist/dist.sh
subversion/branches/svn-patch-improvements/tools/server-side/svn-rep-sharing-stats.c
Propchange: subversion/branches/svn-patch-improvements/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 20:57:53 2010
@@ -33,4 +33,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:918519-919998
+/subversion/trunk:918519-929258
Modified: subversion/branches/svn-patch-improvements/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/CHANGES?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/CHANGES (original)
+++ subversion/branches/svn-patch-improvements/CHANGES Tue Mar 30 20:57:53 2010
@@ -1,3 +1,32 @@
+Version 1.6.10
+(?? ??? 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.10
+
+ User-visible changes:
+ * fix for repositories mounted via NFS (issue #3501)
+ * enable TCP keep-alives in svnserve (r880552)
+ * tighten restrictions on revprops for 'svnadmin verify' (r904594)
+ * make ra_serf give better out-of-date information (issue #3561)
+ * improve error message upon connection failure with svn+ssh:// (r922516)
+ * allow 'svn log' on an uncommitted copy/move destination (r901752)
+ * make 'svnadmin hotcopy' copy the fsfs config file (r905303)
+ * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)
+ * make mergeinfo queries not require access to the repo root (issue #3242)
+ * update URLs to refer the the new apache.org repository (r904301, -94)
+ * update relative externals during a switch (issue #3390)
+ * update fix for dropped mergeinfo revisions in 'svnadmin load' (issue #3020)
+ * fix 'merge --reintegrate' with self-referential mergeinfo (r892050, -85)
+ * fixed: 'svnlook plist --revprop' with '-t TXN_NAME' (r917640, -8211)
+ * fixed: file external from URL cannot overwrite existing item (issue #3552)
+ * fixed: potential memory error in 'svn status' (r923674, -9)
+ * fixed: merge records merginfo from natural history gaps (issue #3432)
+
+ Developer-visible changes:
+ * disable checks for wc-ng working copies when running the test suite
+ * on Windows, don't ignore move operation error codes (r896915)
+ * more precise reporting of errors occuring with sqlite init (r927323, -8)
+
+
Version 1.6.9
(25 Jan 2010, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.9
Modified: subversion/branches/svn-patch-improvements/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/COMMITTERS?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/COMMITTERS [UTF-8] (original)
+++ subversion/branches/svn-patch-improvements/COMMITTERS [UTF-8] Tue Mar 30 20:57:53 2010
@@ -131,7 +131,7 @@ Commit access for specific areas:
build/hudson)
aogier Anthony Ogier <ao...@iorga.com> (svn-merge-vendor.py)
dkagedal David Kågedal <da...@lysator.liu.se> (dsvn.el)
- mattiase Mattias Engdegård <ma...@virtutech.com> (dsvn.el)
+ mattiase Mattias Engdegård <ma...@acm.org> (dsvn.el)
dustin Dustin J. Mitchell <du...@zmanda.com> (svnmerge)
rocketraman Raman Gupta <ro...@fastmail.fm> (svnmerge)
rhansen Richard Hansen <rh...@bbn.com> (svnstsw)
Modified: subversion/branches/svn-patch-improvements/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/Makefile.in?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/Makefile.in (original)
+++ subversion/branches/svn-patch-improvements/Makefile.in Tue Mar 30 20:57:53 2010
@@ -532,6 +532,7 @@ check-clean:
subversion/tests/libsvn_repos/test-repo-* \
subversion/tests/libsvn_subr/z \
subversion/tests/libsvn_wc/fake-wc \
+ subversion/tests/libsvn_client/test-patch* \
subversion/tests/svnserveautocheck.pid \
tests.log
Modified: subversion/branches/svn-patch-improvements/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build.conf?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build.conf (original)
+++ subversion/branches/svn-patch-improvements/build.conf Tue Mar 30 20:57:53 2010
@@ -49,27 +49,12 @@ private-built-includes =
subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
subversion/bindings/swig/proxy/rubyhead.swg
- subversion/bindings/javahl/include/org_apache_subversion_javahl_ClientLogLevel.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_ConflictDescriptor_Kind.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_ConflictDescriptor_Action.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_ConflictDescriptor_Reason.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_ConflictResult.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_Depth.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_LockStatus.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_NodeKind.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_NotifyAction.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_NotifyStatus.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_Operation.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_RevisionKind.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNAdmin.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClientLogLevel.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_ScheduleKind.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_StatusKind.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_Version.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
@@ -223,7 +208,7 @@ type = lib
path = subversion/libsvn_diff
libs = libsvn_subr apriconv apr
install = lib
-msvc-export = svn_diff.h private/svn_diff_private.h
+msvc-export = svn_diff.h
# The repository filesystem library
[libsvn_fs]
@@ -540,6 +525,7 @@ sources = *.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_JAVAC)
classes = subversion/bindings/javahl/classes
+add-deps = $(javahl_java_DEPS)
### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
#jar = svn-javahl.jar
package-roots = org
@@ -553,7 +539,8 @@ link-cmd = $(COMPILE_JAVAHL_JAVAC)
classes = subversion/bindings/javahl/classes
package-roots = org
### Java targets don't do up-to-date checks yet.
-#add-deps = javahl-compat
+#add-deps = javahl-java
+add-deps = $(javahl_java_DEPS)
[javahl-compat-tests]
type = java
@@ -564,7 +551,8 @@ link-cmd = $(COMPILE_JAVAHL_JAVAC)
classes = subversion/bindings/javahl/classes
package-roots = org
### Java targets don't do up-to-date checks yet.
-#add-deps = javahl-java
+#add-deps = javahl-compat-java
+add-deps = $(javahl_compat_java_DEPS)
[javahl-callback-javah]
type = javah
@@ -595,7 +583,7 @@ path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr neon
sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
@@ -886,7 +874,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr libsvn_ra libsvn_client apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
Modified: subversion/branches/svn-patch-improvements/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/ac-macros/swig.m4?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/ac-macros/swig.m4 (original)
+++ subversion/branches/svn-patch-improvements/build/ac-macros/swig.m4 Tue Mar 30 20:57:53 2010
@@ -209,7 +209,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
# Ruby doesn't like '-ansi', so strip that out of CFLAGS
- svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
+ svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g;s/ -std=c89//g"`"
])
SWIG_RB_COMPILE="$svn_cv_ruby_compile"
Modified: subversion/branches/svn-patch-improvements/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/gen_vcnet_vcproj.py?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/svn-patch-improvements/build/generator/gen_vcnet_vcproj.py Tue Mar 30 20:57:53 2010
@@ -141,7 +141,7 @@ class Generator(gen_win.WinGeneratorBase
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
- self.move_proj_file(os.path.join('build', 'win32'),
+ self.move_proj_file(os.path.join('build', 'win32'),
'svn_config' + self.vcproj_extension,
(
('sql', sql),
@@ -180,7 +180,7 @@ class Generator(gen_win.WinGeneratorBase
for target in install_targets:
fname = self.get_external_project(target, self.vcproj_extension[1:])
if fname is None:
- fname = os.path.join(self.projfilesdir, "%s%s" %
+ fname = os.path.join(self.projfilesdir, "%s%s" %
(target.proj_name, self.vcproj_extension))
target.fname = fname
Modified: subversion/branches/svn-patch-improvements/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/gen_win.py?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/gen_win.py (original)
+++ subversion/branches/svn-patch-improvements/build/generator/gen_win.py Tue Mar 30 20:57:53 2010
@@ -395,7 +395,7 @@ class WinGeneratorBase(GeneratorBase):
else:
dll_targets.append(self.create_dll_target(target))
install_targets.extend(dll_targets)
-
+
for target in install_targets:
target.project_guid = self.makeguid(target.name)
@@ -480,9 +480,10 @@ class WinGeneratorBase(GeneratorBase):
jar_exe = os.path.join(self.jdk_path, "bin", jar_exe)
if not isinstance(target, gen_base.TargetProject):
- cbuild = None
- ctarget = None
for source, object, reldir in self.get_win_sources(target):
+ cbuild = None
+ ctarget = None
+ cdesc = None
if isinstance(target, gen_base.TargetJavaHeaders):
classes = self.path(target.classes)
if self.junit_path is not None:
@@ -496,6 +497,7 @@ class WinGeneratorBase(GeneratorBase):
self.quote(headers), classname)
ctarget = self.path(object.filename_win)
+ cdesc = "Generating %s" % (object.filename_win)
elif isinstance(target, gen_base.TargetJavaClasses):
classes = targetdir = self.path(target.classes)
@@ -504,12 +506,13 @@ class WinGeneratorBase(GeneratorBase):
sourcepath = self.path(source.sourcepath)
- cbuild = "%s -g -target 1.2 -source 1.3 -classpath %s -d %s " \
+ cbuild = "%s -g -target 1.5 -source 1.5 -classpath %s -d %s " \
"-sourcepath %s $(InputPath)" \
% tuple(map(self.quote, (javac_exe, classes,
targetdir, sourcepath)))
ctarget = self.path(object.filename)
+ cdesc = "Compiling %s" % (source)
rsrc = self.path(str(source))
if quote_path and '-' in rsrc:
@@ -517,6 +520,7 @@ class WinGeneratorBase(GeneratorBase):
sources.append(ProjectItem(path=rsrc, reldir=reldir, user_deps=[],
custom_build=cbuild, custom_target=ctarget,
+ custom_desc=cdesc,
extension=os.path.splitext(rsrc)[1]))
if isinstance(target, gen_base.TargetJavaClasses) and target.jar:
@@ -694,7 +698,7 @@ class WinGeneratorBase(GeneratorBase):
#
# This section parses those dependencies and adds them to the dependency list
# for this target.
- if name == 'javahl-javah' or name == 'libsvnjavahl':
+ if name[0:7] == 'javahl-' or name == 'libsvnjavahl':
for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
dep = dep.replace('_', '-')
depends.extend(self.sections[dep].get_targets())
Modified: subversion/branches/svn-patch-improvements/build/generator/neon.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/neon.vcxproj.ezt?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/neon.vcxproj.ezt (original)
+++ subversion/branches/svn-patch-improvements/build/generator/neon.vcxproj.ezt Tue Mar 30 20:57:53 2010
@@ -1,4 +1,4 @@
-[define COPYRIGHT]
+[#
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-[end]<?xml version="1.0" encoding="utf-8"?>
+]<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
@@ -26,14 +26,13 @@
</ProjectConfiguration>
[end][end] </ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>neon</ProjectName>
<ProjectGuid>[project_guid]</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <CLRSupport>false</CLRSupport>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -45,9 +44,9 @@
<PropertyGroup>
[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
- <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /nologo /f neon.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /nologo /f neon.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /nologo /f neon.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+ <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /nologo /f neon.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /nologo /f neon.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /nologo /f neon.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[is configs "Release"]libneon.lib[else]libneonD.lib[end]</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
Modified: subversion/branches/svn-patch-improvements/build/generator/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/serf.vcxproj.ezt?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/serf.vcxproj.ezt (original)
+++ subversion/branches/svn-patch-improvements/build/generator/serf.vcxproj.ezt Tue Mar 30 20:57:53 2010
@@ -1,4 +1,4 @@
-[define COPYRIGHT]
+[#
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-[end]<?xml version="1.0" encoding="utf-8"?>
+]<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
@@ -33,7 +33,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <CLRSupport>false</CLRSupport>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -45,9 +45,9 @@
<PropertyGroup>
[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</IntDir>
- <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+ <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\serf.lib</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
Modified: subversion/branches/svn-patch-improvements/build/generator/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/svn_config.vcxproj.ezt?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/svn_config.vcxproj.ezt (original)
+++ subversion/branches/svn-patch-improvements/build/generator/svn_config.vcxproj.ezt Tue Mar 30 20:57:53 2010
@@ -1,4 +1,4 @@
-[define COPYRIGHT]
+[#
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-[end]<?xml version="1.0" encoding="utf-8"?>
+]<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
@@ -26,14 +26,13 @@
</ProjectConfiguration>
[end][end] </ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>__CONFIG__</ProjectName>
<ProjectGuid>[project_guid]</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <CLRSupport>false</CLRSupport>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcproj.ezt?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcproj.ezt Tue Mar 30 20:57:53 2010
@@ -1,4 +1,4 @@
-[define COPYRIGHT]
+[#
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-[end]<?xml version="1.0" encoding = "Windows-1252"?>
+]<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="[version]"
@@ -128,7 +128,8 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="[sources.custom_build]"
- AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
+[if-any sources.custom_desc] Description="[sources.custom_desc]"
+[end] AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
Outputs=""[sources.custom_target]""/>
</FileConfiguration>
[end][end][end]
Modified: subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcxproj.ezt?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/svn-patch-improvements/build/generator/templates/vcnet_vcxproj.ezt Tue Mar 30 20:57:53 2010
@@ -91,7 +91,8 @@
[for configs][for platforms] <Command Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_build]</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[for sources.user_deps][sources.user_deps];[end]%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_target];%(Outputs)</Outputs>
-[end][end] </CustomBuild>
+[if-any sources.custom_desc]<Message Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_desc]</Message>
+[end][end][end] </CustomBuild>
[else][is sources.extension ".c"] <ClCompile Include="[sources.path]" />
[else][is sources.extension ".cpp"] <ClCompile Include="[sources.path]" />
[else] <None Include="[sources.path]" />
Modified: subversion/branches/svn-patch-improvements/build/generator/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/build/generator/zlib.vcxproj.ezt?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/build/generator/zlib.vcxproj.ezt (original)
+++ subversion/branches/svn-patch-improvements/build/generator/zlib.vcxproj.ezt Tue Mar 30 20:57:53 2010
@@ -1,4 +1,4 @@
-[define COPYRIGHT]
+[#
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-[end]<?xml version="1.0" encoding="utf-8"?>
+]<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
@@ -26,14 +26,13 @@
</ProjectConfiguration>
[end][end] </ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>zlib</ProjectName>
<ProjectGuid>[project_guid]</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <CLRSupport>false</CLRSupport>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/svn-patch-improvements/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/contrib/client-side/emacs/dsvn.el?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/svn-patch-improvements/contrib/client-side/emacs/dsvn.el Tue Mar 30 20:57:53 2010
@@ -1,10 +1,11 @@
;;; dsvn.el --- Subversion interface
-;; Copyright 2006-2009 Virtutech AB
+;; Copyright 2006-2010 Virtutech AB
+;; Copyright 2010 Intel
-;; Author: David Kågedal <da...@virtutech.com>
-;; Mattias Engdegård <ma...@virtutech.com>
-;; Maintainer: Mattias Engdegård <ma...@virtutech.com>
+;; Author: David KÃ¥gedal <da...@lysator.liu.se>
+;; Mattias Engdegård <ma...@acm.org>
+;; Maintainer: Mattias Engdegård <ma...@acm.org>
;; Created: 27 Jan 2006
;; Keywords: docs
@@ -316,7 +317,7 @@ during the run."
(setq svn-todo-queue (cdr svn-todo-queue))
(let ((command (car cmd-info))
(args (cadr cmd-info))
- (file-filter (caddr cmd-info)))
+ (file-filter (car (cddr cmd-info))))
(set (make-local-variable 'svn-file-filter) file-filter)
(svn-run command args))))))
Modified: subversion/branches/svn-patch-improvements/notes/meetings/svn-vision-agenda
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/notes/meetings/svn-vision-agenda?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/notes/meetings/svn-vision-agenda (original)
+++ subversion/branches/svn-patch-improvements/notes/meetings/svn-vision-agenda Tue Mar 30 20:57:53 2010
@@ -12,3 +12,19 @@ Potential topics for discussion:
* Beyond Subversion 1.7 -- a high-level roadmap proposal
* How do we encourage additional investment (of time, talent, and treasure)?
* Subversion 2.0 (the Elephant in the Room)
+
+Other non-vision-related stuff, if time allows (or perhaps after hours):
+
+ Stuff Hyrum would like to talk about:
+ * Why is merge slow (compared to $OTHER_SYSTEM)?
+ - Is it endemic to Subversion's architecture, or can it be fixed?
+ * Some musing on FS library design (hopefully with the insight of
+ Mr. Jon Trowbridge).
+
+ Some stuff Mike would like to talk about:
+ * Improve feature negotiation between repos and client (by way of server)
+ - Get repos-dictated config here, too?
+ * Consider dropping back-end feature parity requirement/goal.
+ - Consider improving the backends independently (why should
+ the world wait on obliterate suppport or anything else)
+ * Consider looking into new, more flexible backend designs.
Modified: subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/BlameCallback.cpp?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/BlameCallback.cpp Tue Mar 30 20:57:53 2010
@@ -79,6 +79,11 @@ BlameCallback::singleLine(apr_int64_t li
{
JNIEnv *env = JNIUtil::getEnv();
+ // Create a local frame for our references
+ env->PushLocalFrame(LOCAL_FRAME_SIZE);
+ if (JNIUtil::isJavaExceptionThrown())
+ return SVN_NO_ERROR;
+
// The method id will not change during the time this library is
// loaded, so it can be cached.
static jmethodID mid = 0;
@@ -86,62 +91,42 @@ BlameCallback::singleLine(apr_int64_t li
{
jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/BlameCallback");
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "singleLine",
"(JJLjava/util/Map;JLjava/util/Map;"
"Ljava/lang/String;Ljava/lang/String;Z)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
}
// convert the parameters to their Java relatives
jobject jrevProps = CreateJ::PropertyMap(revProps, pool);
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
jobject jmergedRevProps = NULL;
if (mergedRevProps != NULL)
{
jmergedRevProps = CreateJ::PropertyMap(mergedRevProps, pool);
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
}
jstring jmergedPath = JNIUtil::makeJString(mergedPath);
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
jstring jline = JNIUtil::makeJString(line);
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
// call the Java method
env->CallVoidMethod(m_callback, mid, (jlong)line_no, (jlong)revision,
jrevProps, (jlong)mergedRevision, jmergedRevProps,
jmergedPath, jline, (jboolean)localChange);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- // cleanup the temporary Java objects
- env->DeleteLocalRef(jrevProps);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(jmergedRevProps);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(jmergedPath);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(jline);
// No need to check for an exception here, because we return anyway.
+ env->PopLocalFrame(NULL);
return SVN_NO_ERROR;
}
Modified: subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CommitMessage.cpp?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/CommitMessage.cpp Tue Mar 30 20:57:53 2010
@@ -26,6 +26,7 @@
#include "CommitMessage.h"
#include "CreateJ.h"
+#include "EnumMapper.h"
#include "JNIUtil.h"
#include <apr_tables.h>
#include "svn_client.h"
@@ -105,7 +106,8 @@ CommitMessage::getCommitMessage(const ap
{
midConstructor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "IILjava/lang/String;"
+ "L"JAVA_PACKAGE"/NodeKind;"
+ "ILjava/lang/String;"
"Ljava/lang/String;J)V");
if (JNIUtil::isExceptionThrown())
return NULL;
@@ -139,7 +141,9 @@ CommitMessage::getCommitMessage(const ap
// convert the commit item members to the match Java members
jstring jpath = JNIUtil::makeJString(item->path);
- jint jnodeKind = item->kind;
+ jobject jnodeKind = EnumMapper::mapNodeKind(item->kind);
+ if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
jint jstateFlags = 0;
if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
@@ -159,8 +163,12 @@ CommitMessage::getCommitMessage(const ap
org_apache_subversion_javahl_CommitItemStateFlags_IsCopy;
jstring jurl = JNIUtil::makeJString(item->url);
+ if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
jstring jcopyUrl = JNIUtil::makeJString(item->copyfrom_url);
+ if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
jlong jcopyRevision = item->revision;
@@ -176,6 +184,9 @@ CommitMessage::getCommitMessage(const ap
if (JNIUtil::isJavaExceptionThrown())
return NULL;
+ env->DeleteLocalRef(jnodeKind);
+ if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
env->DeleteLocalRef(jurl);
if (JNIUtil::isJavaExceptionThrown())
Modified: subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.cpp?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.cpp (original)
+++ subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.cpp Tue Mar 30 20:57:53 2010
@@ -26,7 +26,6 @@
#include "svn_error.h"
-#include "../include/org_apache_subversion_javahl_ConflictResult.h"
#include "JNIUtil.h"
#include "JNIStringHolder.h"
#include "EnumMapper.h"
@@ -99,6 +98,11 @@ ConflictResolverCallback::resolve(svn_wc
{
JNIEnv *env = JNIUtil::getEnv();
+ // Create a local frame for our references
+ env->PushLocalFrame(LOCAL_FRAME_SIZE);
+ if (JNIUtil::isJavaExceptionThrown())
+ return SVN_NO_ERROR;
+
// As Java method IDs will not change during the time this library
// is loaded, they can be cached.
static jmethodID mid = 0;
@@ -107,23 +111,19 @@ ConflictResolverCallback::resolve(svn_wc
// Initialize the callback method ID.
jclass clazz = env->FindClass(JAVA_PACKAGE "/callback/ConflictResolverCallback");
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "resolve",
"(L" JAVA_PACKAGE "/ConflictDescriptor;)"
"L" JAVA_PACKAGE "/ConflictResult;");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
}
// Create an instance of the conflict descriptor.
jobject jdesc = CreateJ::ConflictDescriptor(desc);
if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ POP_AND_RETURN(SVN_NO_ERROR);
// Invoke the Java conflict resolver callback method using the descriptor.
jobject jresult = env->CallObjectMethod(m_conflictResolver, mid, jdesc);
@@ -132,17 +132,20 @@ ConflictResolverCallback::resolve(svn_wc
// If an exception is thrown by our conflict resolver, remove it
// from the JNI env, and convert it into a Subversion error.
const char *msg = JNIUtil::thrownExceptionToCString();
- return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, msg);
+ svn_error_t *err = svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
+ NULL, msg);
+ env->PopLocalFrame(NULL);
+ return err;
}
*result = javaResultToC(jresult, pool);
if (*result == NULL)
- // Unable to convert the result into a C representation.
- return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, NULL);
-
- env->DeleteLocalRef(jdesc);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
+ {
+ // Unable to convert the result into a C representation.
+ env->PopLocalFrame(NULL);
+ return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, NULL);
+ }
+ env->PopLocalFrame(NULL);
return SVN_NO_ERROR;
}
@@ -150,6 +153,12 @@ svn_wc_conflict_result_t *
ConflictResolverCallback::javaResultToC(jobject jresult, apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
+
+ // Create a local frame for our references
+ env->PushLocalFrame(LOCAL_FRAME_SIZE);
+ if (JNIUtil::isJavaExceptionThrown())
+ return SVN_NO_ERROR;
+
static jmethodID getChoice = 0;
static jmethodID getMergedPath = 0;
@@ -158,63 +167,41 @@ ConflictResolverCallback::javaResultToC(
{
clazz = env->FindClass(JAVA_PACKAGE "/ConflictResult");
if (JNIUtil::isJavaExceptionThrown())
- return NULL;
+ POP_AND_RETURN_NULL;
}
if (getChoice == 0)
{
- getChoice = env->GetMethodID(clazz, "getChoice", "()I");
+ getChoice = env->GetMethodID(clazz, "getChoice",
+ "()L"JAVA_PACKAGE"/ConflictResult$Choice;");
if (JNIUtil::isJavaExceptionThrown() || getChoice == 0)
- return NULL;
+ POP_AND_RETURN_NULL;
}
if (getMergedPath == 0)
{
getMergedPath = env->GetMethodID(clazz, "getMergedPath",
"()Ljava/lang/String;");
if (JNIUtil::isJavaExceptionThrown() || getMergedPath == 0)
- return NULL;
+ POP_AND_RETURN_NULL;
}
- if (clazz)
- {
- env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
- }
-
- jint jchoice = env->CallIntMethod(jresult, getChoice);
+ jobject jchoice = env->CallObjectMethod(jresult, getChoice);
if (JNIUtil::isJavaExceptionThrown())
- return NULL;
+ POP_AND_RETURN_NULL;
- jstring jmergedPath =
- (jstring) env->CallObjectMethod(jresult, getMergedPath);
+ jstring jmergedPath = (jstring) env->CallObjectMethod(jresult, getMergedPath);
if (JNIUtil::isJavaExceptionThrown())
- return NULL;
+ POP_AND_RETURN_NULL;
+
JNIStringHolder mergedPath(jmergedPath);
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN_NULL;
- return svn_wc_create_conflict_result(javaChoiceToC(jchoice),
+ svn_wc_conflict_result_t *result =
+ svn_wc_create_conflict_result(EnumMapper::toConflictChoice(jchoice),
mergedPath.pstrdup(pool),
pool);
-}
-svn_wc_conflict_choice_t ConflictResolverCallback::javaChoiceToC(jint jchoice)
-{
- switch (jchoice)
- {
- case org_apache_subversion_javahl_ConflictResult_postpone:
- default:
- return svn_wc_conflict_choose_postpone;
- case org_apache_subversion_javahl_ConflictResult_chooseBase:
- return svn_wc_conflict_choose_base;
- case org_apache_subversion_javahl_ConflictResult_chooseTheirsFull:
- return svn_wc_conflict_choose_theirs_full;
- case org_apache_subversion_javahl_ConflictResult_chooseMineFull:
- return svn_wc_conflict_choose_mine_full;
- case org_apache_subversion_javahl_ConflictResult_chooseTheirsConflict:
- return svn_wc_conflict_choose_theirs_conflict;
- case org_apache_subversion_javahl_ConflictResult_chooseMineConflict:
- return svn_wc_conflict_choose_mine_conflict;
- case org_apache_subversion_javahl_ConflictResult_chooseMerged:
- return svn_wc_conflict_choose_merged;
- }
+ env->PopLocalFrame(NULL);
+ return result;
}
Modified: subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.h?rev=929279&r1=929278&r2=929279&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.h (original)
+++ subversion/branches/svn-patch-improvements/subversion/bindings/javahl/native/ConflictResolverCallback.h Tue Mar 30 20:57:53 2010
@@ -91,12 +91,6 @@ class ConflictResolverCallback
*/
static svn_wc_conflict_result_t * javaResultToC(jobject result,
apr_pool_t *pool);
-
- /**
- * Convert the Java conflict resolution @a choice into the
- * appropriate C enum value.
- */
- static svn_wc_conflict_choice_t javaChoiceToC(jint choice);
};
#endif // CONFLICTRESOLVERCALLBACK_H