You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/02/04 21:48:13 UTC
svn commit: r1442344 [1/39] - in /subversion/branches/fsfs-format7: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/
contrib/server-side/fsfsfixer/fixer/ contrib/server-side/svncutter/ doc/ ...
Author: stefan2
Date: Mon Feb 4 20:48:05 2013
New Revision: 1442344
URL: http://svn.apache.org/viewvc?rev=1442344&view=rev
Log:
On the fsfs-format7: ketchup merge from /trunk up to and including r1442089.
Some conflicts due to splitting up fs_fs.c needed to be resolved.
Added:
subversion/branches/fsfs-format7/build/ac-macros/compiler.m4
- copied unchanged from r1442089, subversion/trunk/build/ac-macros/compiler.m4
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svncxxhl/
- copied from r1442089, subversion/trunk/subversion/bindings/cxxhl/include/svncxxhl/
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svncxxhl.hpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/include/svncxxhl.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/exception.cpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/src/exception.cpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/tristate.cpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/src/tristate.cpp
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/tests/
- copied from r1442089, subversion/trunk/subversion/bindings/cxxhl/tests/
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/tests/test_exception.cpp
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/cxxhl/tests/test_exception.cpp
subversion/branches/fsfs-format7/subversion/bindings/swig/python/tests/checksum.py
- copied unchanged from r1442089, subversion/trunk/subversion/bindings/swig/python/tests/checksum.py
subversion/branches/fsfs-format7/subversion/include/private/svn_diff_tree.h
- copied unchanged from r1442089, subversion/trunk/subversion/include/private/svn_diff_tree.h
subversion/branches/fsfs-format7/subversion/include/private/svn_editor.h
- copied unchanged from r1442089, subversion/trunk/subversion/include/private/svn_editor.h
subversion/branches/fsfs-format7/subversion/libsvn_client/copy_foreign.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_client/copy_foreign.c
subversion/branches/fsfs-format7/subversion/libsvn_client/diff_local.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_client/diff_local.c
subversion/branches/fsfs-format7/subversion/libsvn_client/import.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_client/import.c
subversion/branches/fsfs-format7/subversion/libsvn_diff/diff_tree.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_diff/diff_tree.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/sqlite3wrapper.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/delete.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_wc/delete.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/revert.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_wc/revert.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/token-map.h
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_wc/token-map.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/wcroot_anchor.c
- copied unchanged from r1442089, subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c
subversion/branches/fsfs-format7/subversion/svn/cl-conflicts.c
- copied unchanged from r1442089, subversion/trunk/subversion/svn/cl-conflicts.c
subversion/branches/fsfs-format7/subversion/svn/cl-conflicts.h
- copied unchanged from r1442089, subversion/trunk/subversion/svn/cl-conflicts.h
subversion/branches/fsfs-format7/subversion/svn/svn.c
- copied unchanged from r1442089, subversion/trunk/subversion/svn/svn.c
subversion/branches/fsfs-format7/subversion/svnadmin/svnadmin.c
- copied, changed from r1442089, subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/branches/fsfs-format7/subversion/svndumpfilter/svndumpfilter.c
- copied unchanged from r1442089, subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/fsfs-format7/subversion/svnlook/svnlook.c
- copied unchanged from r1442089, subversion/trunk/subversion/svnlook/svnlook.c
subversion/branches/fsfs-format7/subversion/svnserve/svnserve.c
- copied unchanged from r1442089, subversion/trunk/subversion/svnserve/svnserve.c
subversion/branches/fsfs-format7/subversion/svnsync/svnsync.c
- copied unchanged from r1442089, subversion/trunk/subversion/svnsync/svnsync.c
subversion/branches/fsfs-format7/subversion/svnversion/svnversion.c
- copied unchanged from r1442089, subversion/trunk/subversion/svnversion/svnversion.c
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnauthz_tests.py
- copied unchanged from r1442089, subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnrdump_tests_data/root-range.expected.dump
- copied unchanged from r1442089, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/root-range.expected.dump
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-range.expected.dump
- copied unchanged from r1442089, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-range.expected.dump
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnrdump_tests_data/trunk-only-range.expected.dump
- copied unchanged from r1442089, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only-range.expected.dump
subversion/branches/fsfs-format7/subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2
- copied unchanged from r1442089, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2
subversion/branches/fsfs-format7/subversion/tests/libsvn_ra/ (props changed)
- copied from r1442089, subversion/trunk/subversion/tests/libsvn_ra/
subversion/branches/fsfs-format7/subversion/tests/libsvn_ra/ra-test.c
- copied unchanged from r1442089, subversion/trunk/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/fsfs-format7/tools/client-side/svn-bench/svn-bench.c
- copied unchanged from r1442089, subversion/trunk/tools/client-side/svn-bench/svn-bench.c
subversion/branches/fsfs-format7/tools/dev/fsfs-access-map.c
- copied unchanged from r1442089, subversion/trunk/tools/dev/fsfs-access-map.c
subversion/branches/fsfs-format7/tools/dev/fsfs-reorg.c
- copied unchanged from r1442089, subversion/trunk/tools/dev/fsfs-reorg.c
subversion/branches/fsfs-format7/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
- copied unchanged from r1442089, subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
subversion/branches/fsfs-format7/tools/hook-scripts/validate-files.conf.example
- copied unchanged from r1442089, subversion/trunk/tools/hook-scripts/validate-files.conf.example
subversion/branches/fsfs-format7/tools/hook-scripts/validate-files.py
- copied unchanged from r1442089, subversion/trunk/tools/hook-scripts/validate-files.py
subversion/branches/fsfs-format7/tools/server-side/svnauthz.c
- copied unchanged from r1442089, subversion/trunk/tools/server-side/svnauthz.c
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/notes/
- copied from r1442089, subversion/trunk/tools/server-side/svnpubsub/notes/
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/svnwcsub.conf.example
- copied unchanged from r1442089, subversion/trunk/tools/server-side/svnpubsub/svnwcsub.conf.example
Removed:
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/svn_cxxhl_types.h
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/include/types/
subversion/branches/fsfs-format7/subversion/bindings/cxxhl/src/types/
subversion/branches/fsfs-format7/subversion/include/svn_editor.h
subversion/branches/fsfs-format7/subversion/svn/main.c
subversion/branches/fsfs-format7/subversion/svn/tree-conflicts.c
subversion/branches/fsfs-format7/subversion/svn/tree-conflicts.h
subversion/branches/fsfs-format7/subversion/svnadmin/main.c
subversion/branches/fsfs-format7/subversion/svndumpfilter/main.c
subversion/branches/fsfs-format7/subversion/svnlook/main.c
subversion/branches/fsfs-format7/subversion/svnserve/main.c
subversion/branches/fsfs-format7/subversion/svnsync/main.c
subversion/branches/fsfs-format7/subversion/svnversion/main.c
subversion/branches/fsfs-format7/subversion/tests/cmdline/resolved_tests.py
subversion/branches/fsfs-format7/tools/client-side/svn-bench/main.c
subversion/branches/fsfs-format7/tools/dev/gcov.patch
subversion/branches/fsfs-format7/tools/dev/svnraisetreeconflict/main.c
subversion/branches/fsfs-format7/tools/server-side/fsfs-reorg.c
subversion/branches/fsfs-format7/tools/server-side/svnauthz-validate.c
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/example.conf
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/test.conf
Modified:
subversion/branches/fsfs-format7/ (props changed)
subversion/branches/fsfs-format7/CHANGES
subversion/branches/fsfs-format7/COMMITTERS
subversion/branches/fsfs-format7/Makefile.in
subversion/branches/fsfs-format7/aclocal.m4
subversion/branches/fsfs-format7/autogen.sh
subversion/branches/fsfs-format7/build.conf
subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4
subversion/branches/fsfs-format7/build/ac-macros/swig.m4
subversion/branches/fsfs-format7/build/generator/gen_win.py
subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcproj.ezt
subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcxproj.ezt
subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/fsfs-format7/build/run_tests.py
subversion/branches/fsfs-format7/build/transform_sql.py
subversion/branches/fsfs-format7/build/win32/ (props changed)
subversion/branches/fsfs-format7/build/win32/make_dist.py
subversion/branches/fsfs-format7/configure.ac
subversion/branches/fsfs-format7/contrib/client-side/emacs/dsvn.el
subversion/branches/fsfs-format7/contrib/server-side/fsfsfixer/fixer/find_good_id.py
subversion/branches/fsfs-format7/contrib/server-side/fsfsfixer/fixer/fix-rev.py
subversion/branches/fsfs-format7/contrib/server-side/svncutter/svncutter
subversion/branches/fsfs-format7/doc/doxygen.conf
subversion/branches/fsfs-format7/get-deps.sh
subversion/branches/fsfs-format7/notes/commit-access-templates/contrib-committer.tmpl
subversion/branches/fsfs-format7/notes/commit-access-templates/full-committer.tmpl
subversion/branches/fsfs-format7/notes/commit-access-templates/partial-committer.tmpl
subversion/branches/fsfs-format7/notes/commit-access-templates/pmc-member.tmpl
subversion/branches/fsfs-format7/notes/dump-load-format.txt
subversion/branches/fsfs-format7/notes/http-and-webdav/webdav-protocol
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/fsfs-format7/subversion/bindings/swig/core.i
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/native/Base.pm
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion/branches/fsfs-format7/subversion/bindings/swig/perl/native/t/6ra.t
subversion/branches/fsfs-format7/subversion/bindings/swig/python/tests/ra.py
subversion/branches/fsfs-format7/subversion/bindings/swig/python/tests/run_all.py
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/test/test_ra.rb
subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/fsfs-format7/subversion/include/private/svn_client_private.h
subversion/branches/fsfs-format7/subversion/include/private/svn_cmdline_private.h
subversion/branches/fsfs-format7/subversion/include/private/svn_fs_private.h
subversion/branches/fsfs-format7/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/fsfs-format7/subversion/include/private/svn_mutex.h
subversion/branches/fsfs-format7/subversion/include/private/svn_named_atomic.h
subversion/branches/fsfs-format7/subversion/include/private/svn_skel.h
subversion/branches/fsfs-format7/subversion/include/private/svn_sqlite.h
subversion/branches/fsfs-format7/subversion/include/private/svn_subr_private.h
subversion/branches/fsfs-format7/subversion/include/private/svn_wc_private.h
subversion/branches/fsfs-format7/subversion/include/svn_client.h
subversion/branches/fsfs-format7/subversion/include/svn_cmdline.h
subversion/branches/fsfs-format7/subversion/include/svn_config.h
subversion/branches/fsfs-format7/subversion/include/svn_dav.h
subversion/branches/fsfs-format7/subversion/include/svn_delta.h
subversion/branches/fsfs-format7/subversion/include/svn_error.h
subversion/branches/fsfs-format7/subversion/include/svn_fs.h
subversion/branches/fsfs-format7/subversion/include/svn_io.h
subversion/branches/fsfs-format7/subversion/include/svn_mergeinfo.h
subversion/branches/fsfs-format7/subversion/include/svn_path.h
subversion/branches/fsfs-format7/subversion/include/svn_pools.h
subversion/branches/fsfs-format7/subversion/include/svn_props.h
subversion/branches/fsfs-format7/subversion/include/svn_ra.h
subversion/branches/fsfs-format7/subversion/include/svn_repos.h
subversion/branches/fsfs-format7/subversion/include/svn_string.h
subversion/branches/fsfs-format7/subversion/include/svn_subst.h
subversion/branches/fsfs-format7/subversion/include/svn_types.h
subversion/branches/fsfs-format7/subversion/include/svn_wc.h
subversion/branches/fsfs-format7/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/fsfs-format7/subversion/libsvn_client/add.c
subversion/branches/fsfs-format7/subversion/libsvn_client/blame.c
subversion/branches/fsfs-format7/subversion/libsvn_client/cat.c
subversion/branches/fsfs-format7/subversion/libsvn_client/client.h
subversion/branches/fsfs-format7/subversion/libsvn_client/cmdline.c
subversion/branches/fsfs-format7/subversion/libsvn_client/commit.c
subversion/branches/fsfs-format7/subversion/libsvn_client/commit_util.c
subversion/branches/fsfs-format7/subversion/libsvn_client/copy.c
subversion/branches/fsfs-format7/subversion/libsvn_client/delete.c
subversion/branches/fsfs-format7/subversion/libsvn_client/deprecated.c
subversion/branches/fsfs-format7/subversion/libsvn_client/diff.c
subversion/branches/fsfs-format7/subversion/libsvn_client/diff_summarize.c
subversion/branches/fsfs-format7/subversion/libsvn_client/export.c
subversion/branches/fsfs-format7/subversion/libsvn_client/externals.c
subversion/branches/fsfs-format7/subversion/libsvn_client/info.c
subversion/branches/fsfs-format7/subversion/libsvn_client/iprops.c
subversion/branches/fsfs-format7/subversion/libsvn_client/merge.c
subversion/branches/fsfs-format7/subversion/libsvn_client/mergeinfo.c
subversion/branches/fsfs-format7/subversion/libsvn_client/mergeinfo.h
subversion/branches/fsfs-format7/subversion/libsvn_client/patch.c
subversion/branches/fsfs-format7/subversion/libsvn_client/prop_commands.c
subversion/branches/fsfs-format7/subversion/libsvn_client/repos_diff.c
subversion/branches/fsfs-format7/subversion/libsvn_client/resolved.c
subversion/branches/fsfs-format7/subversion/libsvn_client/revert.c
subversion/branches/fsfs-format7/subversion/libsvn_client/status.c
subversion/branches/fsfs-format7/subversion/libsvn_client/switch.c
subversion/branches/fsfs-format7/subversion/libsvn_client/update.c
subversion/branches/fsfs-format7/subversion/libsvn_delta/editor.c
subversion/branches/fsfs-format7/subversion/libsvn_delta/svndiff.c
subversion/branches/fsfs-format7/subversion/libsvn_diff/diff_file.c
subversion/branches/fsfs-format7/subversion/libsvn_diff/diff_memory.c
subversion/branches/fsfs-format7/subversion/libsvn_diff/parse-diff.c
subversion/branches/fsfs-format7/subversion/libsvn_fs/editor.c
subversion/branches/fsfs-format7/subversion/libsvn_fs/fs-loader.c
subversion/branches/fsfs-format7/subversion/libsvn_fs/fs-loader.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/dag.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/dag.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_base/fs.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/dag.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/low_level.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/revprops.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/tree.c
subversion/branches/fsfs-format7/subversion/libsvn_ra/compat.c
subversion/branches/fsfs-format7/subversion/libsvn_ra/deprecated.h
subversion/branches/fsfs-format7/subversion/libsvn_ra/editor.c
subversion/branches/fsfs-format7/subversion/libsvn_ra/ra_loader.c
subversion/branches/fsfs-format7/subversion/libsvn_ra/ra_loader.h
subversion/branches/fsfs-format7/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/commit.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/locks.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/options.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/property.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/replay.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/serf.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/update.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/util.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/editorp.c
subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/authz.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/commit.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/deprecated.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/fs-wrap.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/reporter.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.c
subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.h
subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/cache_config.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/config.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/config_file.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/config_impl.h
subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/io.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/mergeinfo.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/named_atomic.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/opt.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/path.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/prompt.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/properties.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/skel.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/sqlite.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/stream.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/subst.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/sysinfo.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/types.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/version.c
subversion/branches/fsfs-format7/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/adm_crawler.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/adm_files.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/adm_ops.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/cleanup.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/conflicts.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/conflicts.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/copy.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/crop.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/deprecated.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/diff_editor.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/diff_local.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/entries.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/externals.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/info.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/merge.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/node.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/old-and-busted.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/props.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/props.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/questions.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/relocate.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/status.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/translate.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/translate.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/upgrade.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/util.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-queries.sql
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_util.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/workqueue.c
subversion/branches/fsfs-format7/subversion/libsvn_wc/workqueue.h
subversion/branches/fsfs-format7/subversion/mod_authz_svn/INSTALL
subversion/branches/fsfs-format7/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/authz.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/dav_svn.h
subversion/branches/fsfs-format7/subversion/mod_dav_svn/deadprops.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/mirror.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/reports/replay.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/reports/update.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/repos.c
subversion/branches/fsfs-format7/subversion/mod_dav_svn/version.c
subversion/branches/fsfs-format7/subversion/po/de.po
subversion/branches/fsfs-format7/subversion/svn/blame-cmd.c
subversion/branches/fsfs-format7/subversion/svn/cl.h
subversion/branches/fsfs-format7/subversion/svn/conflict-callbacks.c
subversion/branches/fsfs-format7/subversion/svn/copy-cmd.c
subversion/branches/fsfs-format7/subversion/svn/diff-cmd.c
subversion/branches/fsfs-format7/subversion/svn/file-merge.c
subversion/branches/fsfs-format7/subversion/svn/help-cmd.c
subversion/branches/fsfs-format7/subversion/svn/info-cmd.c
subversion/branches/fsfs-format7/subversion/svn/list-cmd.c
subversion/branches/fsfs-format7/subversion/svn/log-cmd.c
subversion/branches/fsfs-format7/subversion/svn/merge-cmd.c
subversion/branches/fsfs-format7/subversion/svn/mergeinfo-cmd.c
subversion/branches/fsfs-format7/subversion/svn/move-cmd.c
subversion/branches/fsfs-format7/subversion/svn/notify.c
subversion/branches/fsfs-format7/subversion/svn/propedit-cmd.c
subversion/branches/fsfs-format7/subversion/svn/propget-cmd.c
subversion/branches/fsfs-format7/subversion/svn/proplist-cmd.c
subversion/branches/fsfs-format7/subversion/svn/props.c
subversion/branches/fsfs-format7/subversion/svn/propset-cmd.c
subversion/branches/fsfs-format7/subversion/svn/resolve-cmd.c
subversion/branches/fsfs-format7/subversion/svn/resolved-cmd.c
subversion/branches/fsfs-format7/subversion/svn/schema/info.rnc
subversion/branches/fsfs-format7/subversion/svn/status.c
subversion/branches/fsfs-format7/subversion/svn/switch-cmd.c
subversion/branches/fsfs-format7/subversion/svn/update-cmd.c
subversion/branches/fsfs-format7/subversion/svn/util.c
subversion/branches/fsfs-format7/subversion/svnmucc/svnmucc.c
subversion/branches/fsfs-format7/subversion/svnrdump/dump_editor.c
subversion/branches/fsfs-format7/subversion/svnrdump/load_editor.c
subversion/branches/fsfs-format7/subversion/svnrdump/svnrdump.c
subversion/branches/fsfs-format7/subversion/svnrdump/svnrdump.h
subversion/branches/fsfs-format7/subversion/svnrdump/util.c
subversion/branches/fsfs-format7/subversion/svnserve/serve.c
subversion/branches/fsfs-format7/subversion/svnserve/server.h
subversion/branches/fsfs-format7/subversion/svnserve/svnserve.8
subversion/branches/fsfs-format7/subversion/svnserve/svnserve.conf.5
subversion/branches/fsfs-format7/subversion/tests/README
subversion/branches/fsfs-format7/subversion/tests/cmdline/README
subversion/branches/fsfs-format7/subversion/tests/cmdline/authz_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/basic_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/blame_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/changelist_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/commit_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/copy_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/davautocheck.sh
subversion/branches/fsfs-format7/subversion/tests/cmdline/depth_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/diff_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/entries-dump.c
subversion/branches/fsfs-format7/subversion/tests/cmdline/entries_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/export_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/externals_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/getopt_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/fsfs-format7/subversion/tests/cmdline/history_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/import_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/info_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/lock_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/log_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/patch_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/prop_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/relocate_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/resolve_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/revert_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/special_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/stat_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/actions.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/main.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/tree.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/verify.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/wc.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/switch_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/update_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/fsfs-format7/subversion/tests/cmdline/wc_tests.py
subversion/branches/fsfs-format7/subversion/tests/libsvn_client/client-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/config-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/error-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/path-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/string-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/subst_translate-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/db-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.c
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.h
subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c
subversion/branches/fsfs-format7/subversion/tests/svn_test_main.c
subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/fsfs-format7/tools/client-side/svn-bench/cl.h
subversion/branches/fsfs-format7/tools/client-side/svn-bench/null-list-cmd.c
subversion/branches/fsfs-format7/tools/client-side/svn-bench/null-log-cmd.c
subversion/branches/fsfs-format7/tools/dev/ (props changed)
subversion/branches/fsfs-format7/tools/dev/benchmarks/suite1/benchmark.py
subversion/branches/fsfs-format7/tools/dev/contribulyze.py
subversion/branches/fsfs-format7/tools/dist/ (props changed)
subversion/branches/fsfs-format7/tools/dist/backport.pl
subversion/branches/fsfs-format7/tools/dist/make-deps-tarball.sh (props changed)
subversion/branches/fsfs-format7/tools/dist/release.py
subversion/branches/fsfs-format7/tools/examples/svnshell.rb
subversion/branches/fsfs-format7/tools/hook-scripts/mailer/mailer.conf.example
subversion/branches/fsfs-format7/tools/hook-scripts/mailer/mailer.py
subversion/branches/fsfs-format7/tools/server-side/ (props changed)
subversion/branches/fsfs-format7/tools/server-side/fsfs-stats.c (contents, props changed)
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/README.txt
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/commit-hook.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/daemonize.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/irkerbridge.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/svnpubsub/client.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/svntweet.py (contents, props changed)
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/testserver.py
subversion/branches/fsfs-format7/tools/server-side/svnpubsub/watcher.py
subversion/branches/fsfs-format7/win-tests.py
Propchange: subversion/branches/fsfs-format7/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 4 20:48:05 2013
@@ -49,3 +49,6 @@ mkmf.log
zlib
sqlite-amalgamation
serf
+gtest
+.git
+.gitignore
Propchange: subversion/branches/fsfs-format7/
------------------------------------------------------------------------------
Merged /subversion/branches/issue-4194-dev:r1410507-1414880
Merged /subversion/branches/wc-collate-path:r1407642
Merged /subversion/branches/tweak-build-take-two:r1424288-1425049,1425051-1425613
Merged /subversion/branches/issue-4116-dev:r1424719-1425040
Merged /subversion/trunk:r1414758-1442089
Merged /subversion/branches/in-repo-authz:r1414342-1424779
Modified: subversion/branches/fsfs-format7/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/CHANGES?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/CHANGES (original)
+++ subversion/branches/fsfs-format7/CHANGES Mon Feb 4 20:48:05 2013
@@ -22,6 +22,7 @@ http://svn.apache.org/repos/asf/subversi
* new --ignore-properties option for 'svn diff' (r1239553. -617)
* new --properties-only option for 'svn diff' (r1336110)
* new --patch-compatible option for 'svn diff' (r1239561)
+ * new --no-diff-added option for 'svn diff' (r1433958)
* new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
* 'svn diff' can compare arbitrary files and directories (r1310291, et al)
* ra_serf avoids re-downloading content present in pristine store (r1333936)
@@ -34,12 +35,15 @@ http://svn.apache.org/repos/asf/subversi
* 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745)
* client version info now reported to commit hooks (issue #4124)
* 'svn merge' now uses reintegrate mode automatically when needed
+ * 'svn' is now non-interactive when not run in a terminal device (r1424037)
+ * 'svn propset' checks spelling of reserved property names.
+ * improve working copy performance on network disks (issue #4176)
- Client-side bugfixes:
- *
+ *
- Server-side bugfixes:
- *
+ * SVNParentPath / repository listing now authz-filtered (r1408184)
- Other tool improvements and bugfixes:
* 'svnmucc' promoted to first-class supported utility (issue #3308)
@@ -55,6 +59,37 @@ http://svn.apache.org/repos/asf/subversi
* star-imports in swig-py only import 'svn_*' symbols (r1303375)
+Version 1.7.8
+(17 Dec 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.8
+ User-visible changes
+ - Client- and server-side bugfixes:
+ * Fix typos in pt_BR, es and zh_TW translations (r1402417, r1402421)
+
+ - Client-side bugfixes:
+ * fix crash with --username option on Windows (r1396285)
+ * add missing attributes to "svn log -v --xml" output (r1398100)
+ * fix svn patch ignoring hunks after no trailing newline (r1399174)
+ * fix hang with ra_serf during error processing (r1403583)
+ * ignore file externals with mergeinfo when merging (r1401915)
+ * fix "svnmucc cp" segfault with a missing last argument (issue #4079)
+ * fix conflict handling on symlinks (issue #4091)
+
+ - Server-side bugfixes:
+ * properly detect threading availability (r1398325)
+ * fix "svnadmin load --bypass-prop-validation" (r1237779)
+ * fix parsing of [groupsfoo] sections in authz file (issue #3531)
+ * add Vary: header to GET responses to improve cacheability (r1390653)
+ * fix fs_fs to cleanup after failed rep transmission (r1403964, et al)
+ * fix mod_dav_svn to complain about revisions > HEAD (r1403588)
+
+ Developer-visible changes:
+ - General:
+ * fix incorrect status returned by 1.6 API (r1403258)
+ * fix compilation with g++ 4.7 (r1345740)
+ * fix svn_uri_get_file_url_from_dirent on Windows (r1409146)
+
+
Version 1.7.7
(09 Oct 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.7
@@ -532,6 +567,21 @@ the 1.6 release: http://subversion.apac
* fixed setting binary properties in JavaHL (issue #3770)
* fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
+
+Version 1.6.20
+(04 Jan 2013, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.20
+
+ User-visible changes
+ - Client- and server-side bugfixes:
+ * Fix typos in pt_BR, es and zh_TW translations (r1402417)
+
+ - Server-side bugfixes:
+ * add Vary: header to GET responses to improve cacheability (r1390653)
+ * fix fs_fs to cleanup after failed rep transmission (r1403964, et al)
+ * fix an assert with SVNAutoVersioning in mod_dav_svn (issue #4231)
+
+
Version 1.6.19
(10 Sep 2012, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.19
@@ -547,6 +597,7 @@ http://svn.apache.org/repos/asf/subversi
- Developer-visible changes:
* fix the testsuite to avoid FAILs on APR hash order (r1230714, et al)
+
Version 1.6.18
(29 Mar 2012, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.18
Modified: subversion/branches/fsfs-format7/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/COMMITTERS?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/COMMITTERS [UTF-8] (original)
+++ subversion/branches/fsfs-format7/COMMITTERS [UTF-8] Mon Feb 4 20:48:05 2013
@@ -131,7 +131,7 @@ Commit access for specific areas:
nori Kobayashi Noritada <no...@dolphin.c.u-tokyo.ac.jp> (Ruby tools,
po: ja) [EMAIL IS
BOUNCING]
- mf Martin Furter <mf...@rola.ch> (svnmirror.sh
+ mf Martin Furter <mf...@apache.org> (svnmirror.sh
svn-backup-dumps.py)
adejong Arthur de Jong <ar...@ch.tudelft.nl> (svn2cl)
wsanchez Wilfredo Sánchez <ws...@wsanchez.net> (various contrib)
@@ -157,6 +157,7 @@ Commit access for specific areas:
artagnon Ramkumar Ramachandra <ar...@gmail.com> (svnrdump, svntest)
arwin Arwin Arni <ar...@collab.net> (svn-bisect)
joes Joe Schaefer <jo...@yahoo.com> (svnpubsub)
+ prabhugs Prabhu Gnana Sundar <pr...@collab.net> (verify-keep-going)
Translation of message files:
Modified: subversion/branches/fsfs-format7/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/Makefile.in?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/Makefile.in (original)
+++ subversion/branches/fsfs-format7/Makefile.in Mon Feb 4 20:48:05 2013
@@ -169,7 +169,11 @@ DOXYGEN = @DOXYGEN@
# The EXTRA_ parameters can be used to pass extra flags at 'make' time.
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
+CMODEFLAGS = @CMODEFLAGS@
+CMAINTAINERFLAGS = @CMAINTAINERFLAGS@
CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
+CXXMODEFLAGS = @CXXMODEFLAGS@
+CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS@
### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes,
### -Wmissing-declarations) are not valid for C++, and should be somehow
### suppressed (but they may come from httpd or APR).
@@ -177,8 +181,8 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
-COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
+COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(LT_CFLAGS)
LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS)
@@ -186,7 +190,7 @@ LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS
LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done`
# special compilation for files destined for mod_dav_svn
-COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CFLAGS) $(CMAINTAINERFLAGS) $(LT_CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
# special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
@@ -404,7 +408,7 @@ fast-clean: doc-clean
rm -rf .libs); \
fi \
done
- echo $(CLEAN_FILES) | xargs rm -f
+ echo $(CLEAN_FILES) | xargs rm -f --
find $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
$(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest \
-name "*.pyc" -exec rm {} ';'
@@ -572,9 +576,26 @@ svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_
bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
@$(MAKE) check FS_TYPE=bdb
-check-clean:
- rm -rf subversion/tests/cmdline/svn-test-work \
- subversion/tests/libsvn_fs/test-repo-* \
+# Create an execution coverage report from the data collected during
+# all execution since the last reset.
+gcov:
+ lcov --capture -d . -b . -o gcov-lcov.dat > gcov-lcov.log
+ genhtml gcov-lcov.dat -o gcov-report > gcov-genhtml.log
+
+# Reset all execution coverage counters to zero.
+gcov-reset:
+ lcov --zerocounters -d .
+
+# Remove the execution coverage data and the report.
+gcov-clean:
+ rm -f gcov-lcov.dat gcov-lcov.log gcov-genhtml.log
+ rm -rf gcov-report
+ find . -name "*.gcda" -o -name "*.gcno" -print0 | xargs -0 rm -f --
+
+check-clean: gcov-clean
+ find subversion/tests/cmdline/svn-test-work -print0 \
+ -mindepth 1 -maxdepth 1 | xargs -0 rm -rf --; \
+ rm -rf subversion/tests/libsvn_fs/test-repo-* \
subversion/tests/libsvn_fs_base/test-repo-* \
subversion/tests/libsvn_fs_fs/test-repo-* \
subversion/tests/libsvn_ra_local/test-repo-* \
Modified: subversion/branches/fsfs-format7/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/aclocal.m4?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/aclocal.m4 (original)
+++ subversion/branches/fsfs-format7/aclocal.m4 Mon Feb 4 20:48:05 2013
@@ -36,10 +36,10 @@ sinclude(build/ac-macros/apr.m4)
sinclude(build/ac-macros/aprutil.m4)
sinclude(build/ac-macros/apr_memcache.m4)
sinclude(build/ac-macros/berkeley-db.m4)
+sinclude(build/ac-macros/compiler.m4)
sinclude(build/ac-macros/ctypesgen.m4)
sinclude(build/ac-macros/gssapi.m4)
sinclude(build/ac-macros/java.m4)
-sinclude(build/ac-macros/neon.m4)
sinclude(build/ac-macros/sasl.m4)
sinclude(build/ac-macros/serf.m4)
sinclude(build/ac-macros/sqlite.m4)
Modified: subversion/branches/fsfs-format7/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/autogen.sh?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/autogen.sh (original)
+++ subversion/branches/fsfs-format7/autogen.sh Mon Feb 4 20:48:05 2013
@@ -140,6 +140,9 @@ if test -n "$RELEASE_MODE"; then
# Build the SWIG-related files
make -f autogen-standalone.mk autogen-swig
+
+ # Remove the .swig_checked file
+ rm -f .swig_checked
fi
if test -n "$SKIP_DEPS"; then
@@ -199,6 +202,8 @@ echo ""
echo "./configure --enable-maintainer-mode"
echo "./configure --disable-shared"
echo "./configure --enable-maintainer-mode --disable-shared"
+echo "./configure --disable-optimize --enable-debug"
+echo "./configure CUSERFLAGS='--flags-for-C' CXXUSERFLAGS='--flags-for-C++'"
echo ""
echo "Note: If you wish to run a Subversion HTTP server, you will need"
echo "Apache 2.x. See the INSTALL file for details."
Modified: subversion/branches/fsfs-format7/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build.conf?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build.conf (original)
+++ subversion/branches/fsfs-format7/build.conf Mon Feb 4 20:48:05 2013
@@ -38,8 +38,8 @@ private-includes =
subversion/include/private/*.h
subversion/bindings/swig/include/*.swg
subversion/libsvn_delta/compose_delta.c
- subversion/bindings/cxxhl/include/*.h
- subversion/bindings/cxxhl/include/types/*.h
+ subversion/bindings/cxxhl/include/*.hpp
+ subversion/bindings/cxxhl/include/svncxxhl/*.hpp
private-built-includes =
subversion/svn_private_config.h
subversion/libsvn_fs_fs/rep-cache-db.h
@@ -59,6 +59,8 @@ private-built-includes =
subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
+ subversion/svn/svn-help.inc
+ subversion/svn/svn-help.man
test-scripts =
@@ -174,7 +176,7 @@ manpages = subversion/svnversion/svnvers
description = Subversion remote repository dumper and loader
type = exe
path = subversion/svnrdump
-libs = libsvn_client libsvn_ra libsvn_repos libsvn_delta libsvn_subr apr
+libs = libsvn_client libsvn_ra libsvn_repos libsvn_delta libsvn_subr aprutil apr
install = bin
manpages = subversion/svnrdump/svnrdump.1
@@ -219,7 +221,7 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_delta
libs = libsvn_subr aprutil apriconv apr zlib
-msvc-export = svn_delta.h svn_editor.h private/svn_delta_private.h
+msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h
# Routines for diffing
[libsvn_diff]
@@ -228,7 +230,7 @@ type = lib
path = subversion/libsvn_diff
libs = libsvn_subr apriconv apr zlib
install = lib
-msvc-export = svn_diff.h private\svn_diff_private.h
+msvc-export = svn_diff.h private/svn_diff_private.h private/svn_diff_tree.h
# The repository filesystem library
[libsvn_fs]
@@ -629,16 +631,27 @@ link-cmd = $(LINK_JAVAHL_CXX)
#
[libsvncxxhl]
-description = Subversion C++ HighLevel binding
+description = Subversion C++ HighLevel bindings
type = lib
path = subversion/bindings/cxxhl
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr
-sources = src/*.cpp src/types/*.cpp
+sources = src/*.cpp
install = cxxhl-lib
+msvc-static = yes
compile-cmd = $(COMPILE_CXXHL_CXX)
link-cmd = $(LINK_CXX_LIB)
+[cxxhl-tests]
+description = Unit tests for Subversion C++ HighLevel bindings
+type = exe
+path = subversion/bindings/cxxhl
+libs = libsvncxxhl libsvn_subr
+sources = tests/*.cpp
+install = tests
+compile-cmd = $(COMPILE_CXXHL_CXX)
+link-cmd = $(LINK_CXX)
+
# ----------------------------------------------------------------------------
#
# TESTING TARGETS
@@ -970,6 +983,18 @@ install = test
libs = libsvn_test libsvn_diff libsvn_subr apriconv apr
# ----------------------------------------------------------------------------
+# Tests for libsvn_ra
+
+[ra-test]
+description = Test a few things in libsvn_ra
+type = exe
+path = subversion/tests/libsvn_ra
+sources = ra-test.c
+install = test
+libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr
+ apriconv apr
+
+# ----------------------------------------------------------------------------
# Tests for libsvn_ra_local
[ra-local-test]
@@ -1179,7 +1204,7 @@ path = build/win32
libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
svnversion
mod_authz_svn mod_dav_svn mod_dontdothat
- svnauthz-validate svnraisetreeconflict
+ svnauthz svnauthz-validate svnraisetreeconflict
[__ALL_TESTS__]
type = project
@@ -1195,10 +1220,11 @@ libs = __ALL__
translate-test
random-test window-test
diff-diff3-test
+ ra-test
ra-local-test
svndiff-test vdelta-test
entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester
- diff diff3 diff4 fsfs-reorg fsfs-stats svn-bench
+ diff diff3 diff4 fsfs-reorg fsfs-stats fsfs-access-map svn-bench
client-test
conflict-data-test db-test pristine-store-test entries-compat-test
op-depth-test dirent_uri-test wc-queries-test wc-test
@@ -1249,7 +1275,7 @@ libs = __JAVAHL__ javahl-tests javahl-co
[fsfs-reorg]
type = exe
-path = tools/server-side
+path = tools/dev
sources = fsfs-reorg.c
install = tools
libs = libsvn_delta libsvn_subr apr
@@ -1261,6 +1287,13 @@ sources = fsfs-stats.c
install = tools
libs = libsvn_delta libsvn_subr apr
+[fsfs-access-map]
+type = exe
+path = tools/dev
+sources = fsfs-access-map.c
+install = tools
+libs = libsvn_subr apr
+
[diff]
type = exe
path = tools/diff
@@ -1289,13 +1322,26 @@ install = tools
libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta
apriconv apr
+[svnauthz]
+description = Authz config file tool
+type = exe
+path = tools/server-side
+sources = svnauthz.c
+install = tools
+libs = libsvn_repos libsvn_fs libsvn_subr apr
+
+# svnauthz-validate is the compat mode of the new svnauthz tool. It is
+# exactly the same code as svnauthz. This duplicated target is needed
+# in order to easily test both commands as part of the build since libtool
+# does not provide a way to set argv[0] different from the commands actual
+# name in the wrapper script.
[svnauthz-validate]
description = Authz config file validator
type = exe
path = tools/server-side
-sources = svnauthz-validate.c
+sources = svnauthz.c
install = tools
-libs = libsvn_repos libsvn_subr apr
+libs = libsvn_repos libsvn_fs libsvn_subr apr
[svn-populate-node-origins-index]
type = exe
Modified: subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4 Mon Feb 4 20:48:05 2013
@@ -141,35 +141,14 @@ done
$1="${svn_cur}"
])
-dnl SVN_MAYBE_ADD_TO_CFLAGS(option)
+dnl SVN_STRIP_FLAG(FLAG_VAR_NAME, FLAG)
dnl
-dnl Attempt to compile a trivial C program to test if the option passed
-dnl is valid. If it is, then add it to CFLAGS. with the passed in option
-dnl and see if it was successfully compiled.
-dnl
-dnl This macro is usually used for stricter syntax checking flags.
-dnl Therefore we include certain headers which may in turn include system
-dnl headers, as system headers on some platforms may fail strictness checks
-dnl we wish to use on other platforms.
-
-AC_DEFUN(SVN_MAYBE_ADD_TO_CFLAGS,
+dnl Remove FLAG from the variable FLAG_VAR_NAME, if it exists. This macro
+dnl is primarily used for removing unwanted compiler flags, but is really
+dnl just a general wrapper around `sed'.
+AC_DEFUN(SVN_STRIP_FLAG,
[
- option="$1"
- svn_maybe_add_to_cflags_saved_flags="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([if $CC accepts $option])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[#include <apr_portable.h>]],
- [[]])],
- [svn_maybe_add_to_cflags_ok="yes"],
- [svn_maybe_add_to_cflags_ok="no"]
- )
- if test "$svn_maybe_add_to_cflags_ok" = "yes"; then
- AC_MSG_RESULT([yes, will use it])
- else
- AC_MSG_RESULT([no])
- CFLAGS="$svn_maybe_add_to_cflags_saved_flags"
- fi
+ $1=`echo "$$1" | $SED -e 's/$2//'`
])
dnl SVN_REMOVE_STANDARD_LIB_DIRS(OPTIONS)
Modified: subversion/branches/fsfs-format7/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/swig.m4?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/swig.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/swig.m4 Mon Feb 4 20:48:05 2013
@@ -120,10 +120,6 @@ AC_DEFUN(SVN_FIND_SWIG,
])
SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
- dnl Swig-generated code results in a number of shadowed variables, so
- dnl ignore those warnings when compiling swig-py
- SWIG_PY_COMPILE=`echo "$SWIG_PY_COMPILE" | $SED -e 's/-Wshadow //'`
-
AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
])
@@ -209,10 +205,14 @@ AC_DEFUN(SVN_FIND_SWIG,
SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
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;s/ -std=c89//g"`"
+ svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
])
SWIG_RB_COMPILE="$svn_cv_ruby_compile"
+ SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-ansi])
+ SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c89])
+ SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c90])
+ dnl FIXME: Check that the compiler for Ruby actually supports this flag
+ SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
@@ -230,7 +230,10 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_MSG_CHECKING([for rb_errinfo])
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
- CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g;s/ -std=c89//g"` $svn_cv_ruby_includes"
+ CFLAGS="$CFLAGS $svn_cv_ruby_includes"
+ SVN_STRIP_FLAG([CFLAGS], [-ansi])
+ SVN_STRIP_FLAG([CFLAGS], [-std=c89])
+ SVN_STRIP_FLAG([CFLAGS], [-std=c90])
LIBS="$SWIG_RB_LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <ruby.h>
Modified: subversion/branches/fsfs-format7/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/gen_win.py?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/gen_win.py (original)
+++ subversion/branches/fsfs-format7/build/generator/gen_win.py Mon Feb 4 20:48:05 2013
@@ -462,7 +462,10 @@ class WinGeneratorBase(GeneratorBase):
# Link everything except tests against the dll. Tests need to be linked
# against the static libraries because they sometimes access internal
# library functions.
- if dep in deps[key] and key.find("test") == -1:
+
+ # ### The magic behavior for 'test' in a name and 'entries-dump' should
+ # ### move to another option in build.conf
+ if dep in deps[key] and key.find("test") == -1 and key != 'entries-dump':
deps[key].remove(dep)
deps[key].append(target)
Modified: subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcproj.ezt?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcproj.ezt (original)
+++ subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcproj.ezt Mon Feb 4 20:48:05 2013
@@ -22,7 +22,7 @@
ProjectType="Visual C++"
Version="[version]"
Name="locale"
- ProjectGUID="{18FA6D17-1EE7-43A2-BC2A-C2AF819CEEFB}"
+ ProjectGUID="[project_guid]"
Keyword="MakeFileProj">
<Platforms>
[for platforms] <Platform
Modified: subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcxproj.ezt?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcxproj.ezt (original)
+++ subversion/branches/fsfs-format7/build/generator/templates/svn_locale.vcxproj.ezt Mon Feb 4 20:48:05 2013
@@ -27,7 +27,7 @@
[end][end] </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>locale</ProjectName>
- <ProjectGuid>{18FA6D17-1EE7-43A2-BC2A-C2AF819CEEFB}</ProjectGuid>
+ <ProjectGuid>[project_guid]</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Modified: subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcproj.ezt?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcproj.ezt Mon Feb 4 20:48:05 2013
@@ -56,10 +56,10 @@
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
[end] WarningLevel="4"
- DisableSpecificWarnings="4100;4127;4204;4206;4701;4706"
+ DisableSpecificWarnings="4100;4127;4206;4701;4706"
Detect64BitPortabilityProblems="FALSE"
AdditionalOptions="
- /we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4115 /we4715"
+ /we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4115 /we4204 /we4715"
DebugInformationFormat="3"
ProgramDataBaseFileName="$(IntDir)\[target.output_pdb]"
CompileAsManaged="0"
Modified: subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcxproj.ezt?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/fsfs-format7/build/generator/templates/vcnet_vcxproj.ezt Mon Feb 4 20:48:05 2013
@@ -63,8 +63,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BrowseInformation>true</BrowseInformation>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
- <DisableSpecificWarnings>4100;4127;4204;4206;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4715;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+ <DisableSpecificWarnings>4100;4127;4206;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4204;4715;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
</ClCompile>
[is config_type "Application"] <Link>
<AdditionalDependencies>[for configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
Modified: subversion/branches/fsfs-format7/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/run_tests.py?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/run_tests.py (original)
+++ subversion/branches/fsfs-format7/build/run_tests.py Mon Feb 4 20:48:05 2013
@@ -354,7 +354,7 @@ class TestHarness:
if self.config_file is not None:
cmdline.append('--config-file=' + self.config_file)
else:
- print('Don\'t know what to do about ' + progbase)
+ print("Don't know what to do about " + progbase)
sys.exit(1)
if self.verbose is not None:
@@ -433,8 +433,8 @@ class TestHarness:
prog_mod = imp.load_module(progbase[:-3], open(prog, 'r'), prog,
('.py', 'U', imp.PY_SOURCE))
except:
- print('Don\'t know what to do about ' + progbase)
- raise
+ print("Don't know what to do about " + progbase)
+ sys.exit(1)
import svntest.main
@@ -565,11 +565,12 @@ class TestHarness:
progdir, progbase = os.path.split(prog)
if self.log:
# Using write here because we don't want even a trailing space
- test_info = '%s [%d/%d]' % (progbase, test_nr + 1, total_tests)
+ test_info = '[%s/%d] %s' % (str(test_nr + 1).zfill(len(str(total_tests))),
+ total_tests, progbase)
if self.list_tests:
sys.stdout.write('Listing tests in %s' % (test_info, ))
else:
- sys.stdout.write('Running tests in %s' % (test_info, ))
+ sys.stdout.write('%s' % (test_info, ))
sys.stdout.flush()
else:
# ### Hack for --log-to-stdout to work (but not print any dots).
@@ -589,7 +590,6 @@ class TestHarness:
line_length = _get_term_width()
dots_needed = line_length \
- len(test_info) \
- - len('Running tests in ') \
- len('success')
try:
os.chdir(progdir)
Modified: subversion/branches/fsfs-format7/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/transform_sql.py?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/transform_sql.py (original)
+++ subversion/branches/fsfs-format7/build/transform_sql.py Mon Feb 4 20:48:05 2013
@@ -25,11 +25,19 @@
#
+import operator
import os
import re
import sys
+# operator.methodcaller doesn't exist in Python 2.5.
+if not hasattr(operator, 'methodcaller'):
+ def methodcaller(method, *args, **kwargs):
+ return lambda x: getattr(x, method)(*args, **kwargs)
+ operator.methodcaller = methodcaller
+ del methodcaller
+
DEFINE_END = ' ""\n\n'
@@ -89,10 +97,11 @@ class Processor(object):
self.output.write(' APR_STRINGIFY(%s) \\\n' % define)
- def __init__(self, dirpath, output, var_name):
+ def __init__(self, dirpath, output, var_name, token_map):
self.dirpath = dirpath
self.output = output
self.var_name = var_name
+ self.token_map = token_map
self.stmt_count = 0
self.var_printed = False
@@ -140,6 +149,11 @@ class Processor(object):
r" AND ((\1) < CASE (\2) WHEN '' THEN X'FFFF' ELSE (\2) || '0' END))",
line)
+ # Another preprocessing.
+ for symbol, string in self.token_map.iteritems():
+ # ### This doesn't sql-escape 'string'
+ line = re.sub(r'\b%s\b' % re.escape(symbol), "'%s'" % string, line)
+
if line.strip():
handled = False
@@ -172,10 +186,51 @@ class Processor(object):
self.var_printed = False
+class NonRewritableDict(dict):
+ """A dictionary that does not allow self[k]=v when k in self
+ (unless v is equal to the stored value).
+
+ (An entry would have to be explicitly deleted before a new value
+ may be entered.)
+ """
+
+ def __setitem__(self, key, val):
+ if self.__contains__(key) and self.__getitem__(key) != val:
+ raise Exception("Can't re-insert key %r with value %r "
+ "(already present with value %r)"
+ % (key, val, self.__getitem__(key)))
+ super(NonRewritableDict, self).__setitem__(key, val)
+
+def hotspots(fd):
+ hotspot = False
+ for line in fd:
+ # hotspot is TRUE within definitions of static const svn_token_map_t[].
+ hotspot ^= int(('svn_token_map_t', '\x7d;')[hotspot] in line)
+ if hotspot:
+ yield line
+
+def extract_token_map(filename):
+ try:
+ fd = open(filename)
+ except IOError:
+ return {}
+
+ pattern = re.compile(r'"(.*?)".*?(MAP_\w*)')
+ return \
+ NonRewritableDict(
+ map(operator.itemgetter(1,0),
+ map(operator.methodcaller('groups'),
+ filter(None,
+ map(pattern.search,
+ hotspots(fd))))))
+
def main(input_filepath, output):
filename = os.path.basename(input_filepath)
input = open(input_filepath, 'r').read()
+ token_map_filename = os.path.dirname(input_filepath) + '/token-map.h'
+ token_map = extract_token_map(token_map_filename)
+
var_name = re.sub('[-.]', '_', filename).upper()
output.write(
@@ -184,7 +239,7 @@ def main(input_filepath, output):
'\n'
% (filename,))
- proc = Processor(os.path.dirname(input_filepath), output, var_name)
+ proc = Processor(os.path.dirname(input_filepath), output, var_name, token_map)
proc.process_file(input)
### the STMT_%d naming precludes *multiple* transform_sql headers from
Propchange: subversion/branches/fsfs-format7/build/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 4 20:48:05 2013
@@ -1,5 +1,4 @@
build_locale.bat
-build_neon.bat
build_zlib.bat
make_dist.conf
make_dist.log
Modified: subversion/branches/fsfs-format7/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/win32/make_dist.py?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/win32/make_dist.py (original)
+++ subversion/branches/fsfs-format7/build/win32/make_dist.py Mon Feb 4 20:48:05 2013
@@ -215,6 +215,8 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnmucc/svnmucc.pdb'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
+ File('%(blddir)s/../tools/server-side/svnauthz.exe'),
+ File('%(blddir)s/../tools/server-side/svnauthz.pdb'),
File('%(blddir)s/../tools/server-side/svnauthz-validate.exe'),
File('%(blddir)s/../tools/server-side/svnauthz-validate.pdb'),
File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.exe'),
Modified: subversion/branches/fsfs-format7/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/configure.ac?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/configure.ac (original)
+++ subversion/branches/fsfs-format7/configure.ac Mon Feb 4 20:48:05 2013
@@ -49,10 +49,16 @@ SVN_CONFIG_NICE(config.nice)
# ==== Check for programs ====================================================
# Look for a C compiler (before anything can set CFLAGS)
+CMAINTAINERFLAGS="$CUSERFLAGS"
+CUSERFLAGS="$CFLAGS"
AC_PROG_CC
+SVN_CC_MODE_SETUP
-# Look for a C++ compiler
+# Look for a C++ compiler (before anything can set CXXFLAGS)
+CXXMAINTAINERFLAGS="$CXXUSERFLAGS"
+CXXUSERFLAGS="$CXXFLAGS"
AC_PROG_CXX
+SVN_CXX_MODE_SETUP
# Look for a C pre-processor
AC_PROG_CPP
@@ -99,18 +105,21 @@ SVN_LIB_APR($APR_VER_REGEXES)
if test `expr $apr_version : 2` -ne 0; then
dnl Bump the library so-version to 2 if using APR-2
dnl (Debian uses so-version 1 for APR-1-with-largefile)
- SVN_LT_SOVERSION="-version-info 2"
+ svn_lib_ver=2
dnl APR-2 provides APRUTIL
apu_config=$apr_config
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
else
- SVN_LT_SOVERSION="-version-info 0"
+ svn_lib_ver=0
APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
SVN_LIB_APRUTIL($APU_VER_REGEXES)
fi
+SVN_LT_SOVERSION="-version-info $svn_lib_ver"
AC_SUBST(SVN_LT_SOVERSION)
+AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
+ [Subversion library major verson])
dnl Search for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config)
@@ -145,9 +154,8 @@ SVN_FIND_APACHE(20020903)
dnl Search for SQLite
SQLITE_MINIMUM_VER="3.7.12"
-SQLITE_RECOMMENDED_VER="3.7.12"
-SQLITE_RECOMMENDED_VER_URL="3071200"
-SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER_URL}.zip"
+SQLITE_RECOMMENDED_VER="3.7.15.1"
+SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"
SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
${SQLITE_URL})
@@ -895,6 +903,13 @@ AC_CHECK_FUNCS(symlink readlink)
dnl check for uname
AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], [])
+dnl check for termios
+AC_CHECK_HEADER(termios.h,[
+ AC_CHECK_FUNCS(tcgetattr tcsetattr,[
+ AC_DEFINE(HAVE_TERMIOS_H,1,[Defined if we have a usable termios library.])
+ ])
+])
+
dnl Process some configuration options ----------
AC_ARG_WITH(ssl,
@@ -934,22 +949,22 @@ AS_HELP_STRING([--enable-debug],
[
# Neither --enable-debug nor --disable-debug was passed.
enable_debugging="maybe"
-
- # We leave this as 'maybe' because setting it to 'no' would modify the
- # CFLAGS/CXXFLAGS later (just after the --enable-maintainer-mode block),
- # and we don't want to force that.
- #
- # TODO: set enable_debugging='no' here, and provide another way to disable
- # the CFLAGS/CXXFLAGS munging.
])
-
-dnl Add -Werror=implicit-function-declaration to CFLAGS
-CFLAGS_KEEP="$CFLAGS"
-CFLAGS="$CFLAGS_KEEP -Werror=implicit-function-declaration"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
-CFLAGS="$CFLAGS_KEEP"
-
+AC_ARG_ENABLE(optimize,
+AS_HELP_STRING([--enable-optimize],
+ [Turn on optimizations]),
+[
+ if test "$enableval" = "yes" ; then
+ enable_optimization="yes"
+ else
+ enable_optimization="no"
+ fi
+],
+[
+ # Neither --enable-optimize nor --disable-optimize was passed.
+ enable_optimization="maybe"
+])
dnl Use -Wl,--no-undefined during linking of some libraries
AC_ARG_ENABLE(disallowing-of-undefined-references,
@@ -1003,89 +1018,138 @@ AS_HELP_STRING([--enable-maintainer-mode
AC_MSG_ERROR([Can't have --disable-debug and --enable-maintainer-mode])
fi
enable_debugging=yes
+
+ dnl Enable some extra warnings. Put these before the user's flags
+ dnl so the user can specify flags that override these.
if test "$GCC" = "yes"; then
AC_MSG_NOTICE([maintainer-mode: adding GCC warning flags])
- dnl Enable some extra warnings. Put these before the user's flags
- dnl so the user can specify flags that override these.
- CFLAGS="-Wpointer-arith -Wwrite-strings -Wshadow -ansi -Wall -Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs -Wunreachable-code -Winline -Wno-long-long $CFLAGS"
- CXXFLAGS="-Wpointer-arith -Wwrite-strings -Wshadow -ansi -Wall $CXXFLAGS"
dnl some additional flags that can be handy for an occasional review,
dnl but throw too many warnings in svn code, of too little importance,
dnl to keep these enabled. Remove the "dnl" to do a run with these
dnl switches enabled.
- dnl CFLAGS="-Wswitch-enum -Wswitch-default $CFLAGS"
+ dnl ./configure CUSERFLAGS="-Wswitch-enum -Wswitch-default"
dnl Add each of the following flags only if the C compiler accepts it.
-
CFLAGS_KEEP="$CFLAGS"
- AC_LANG_PUSH([C])
-
- CFLAGS="-Werror=declaration-after-statement $CFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+ CFLAGS=""
- CFLAGS="-Wextra-tokens $CFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+ SVN_CFLAGS_ADD_IFELSE([-Werror=implicit-function-declaration])
+ SVN_CFLAGS_ADD_IFELSE([-Werror=declaration-after-statement])
+ SVN_CFLAGS_ADD_IFELSE([-Wextra-tokens])
+ SVN_CFLAGS_ADD_IFELSE([-Wnewline-eof])
+ SVN_CFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
+ SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
+ SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
+ SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
- CFLAGS="-Wnewline-eof $CFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
-
- CFLAGS="-Wshorten-64-to-32 $CFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
-
- 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"])
-
- dnl Put this flag behind -Wall:
-
- CFLAGS="$CFLAGS_KEEP -Wno-format-nonliteral"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
-
- AC_LANG_POP([C])
+ CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
CFLAGS="$CFLAGS_KEEP"
- dnl Add each of the following flags only if the C++ compiler accepts it.
+ dnl Add flags that all versions of GCC (should) support
+ CMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs -Winline -Wno-long-long $CMAINTAINERFLAGS"
+ fi
+ if test "$GXX" = "yes"; then
+ AC_MSG_NOTICE([maintainer-mode: adding G++ warning flags])
+ dnl Add each of the following flags only if the C++ compiler accepts it.
CXXFLAGS_KEEP="$CXXFLAGS"
- AC_LANG_PUSH([C++])
-
- CXXFLAGS="-Wextra-tokens $CXXFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CXXFLAGS_KEEP="$CXXFLAGS"])
+ CXXFLAGS=""
- CXXFLAGS="-Wshorten-64-to-32 $CXXFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CXXFLAGS_KEEP="$CXXFLAGS"])
+ SVN_CXXFLAGS_ADD_IFELSE([-Wextra-tokens])
+ SVN_CXXFLAGS_ADD_IFELSE([-Wnewline-eof])
+ SVN_CXXFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
+ SVN_CXXFLAGS_ADD_IFELSE([-Wno-system-headers])
- CXXFLAGS="-Wno-system-headers $CXXFLAGS_KEEP"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CXXFLAGS_KEEP="$CXXFLAGS"])
-
- AC_LANG_POP([C++])
+ CXXMAINTAINERFLAGS="$CXXFLAGS $CXXMAINTAINERFLAGS"
CXXFLAGS="$CXXFLAGS_KEEP"
+
+ dnl Add flags that all versions of G++ (should) support
+ CXXMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow -Wunused -Wunreachable-code $CXXMAINTAINERFLAGS"
fi
fi
])
if test "$enable_debugging" = "yes" ; then
dnl At the moment, we don't want optimization, because we're
- dnl debugging.
- CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
- CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ dnl debugging. Unless optiization was explicitly enabled.
+ if test "$enable_optimization" != "yes"; then
+ AC_MSG_NOTICE([Disabling optimizations for debugging])
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ fi
+ dnl Add debugging flags, unless they were set by the user
+ if test -z ["`echo $CUSERFLAGS' ' | $EGREP -- '-g[0-9]? '`"]; then
+ AC_MSG_NOTICE([Enabling debugging for C])
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
+ SVN_CFLAGS_ADD_IFELSE([-fno-inline])
+ SVN_CFLAGS_ADD_IFELSE([-fno-omit-frame-pointer])
+ SVN_CFLAGS_ADD_IFELSE([-g3],[],[
+ SVN_CFLAGS_ADD_IFELSE([-g2],[],[
+ SVN_CFLAGS_ADD_IFELSE([-g])])])
+ fi
+ if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-g[0-9]? '`"]; then
+ AC_MSG_NOTICE([Enabling debugging for C++])
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
+ SVN_CXXFLAGS_ADD_IFELSE([-fno-inline])
+ SVN_CXXFLAGS_ADD_IFELSE([-fno-omit-frame-pointer])
+ SVN_CXXFLAGS_ADD_IFELSE([-g3],[],[
+ SVN_CXXFLAGS_ADD_IFELSE([-g2],[],[
+ SVN_CXXFLAGS_ADD_IFELSE([-g])])])
+ fi
dnl SVN_DEBUG enables specific features for developer builds
dnl AP_DEBUG enables specific (Apache) features for developer builds
CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
elif test "$enable_debugging" = "no" ; then
- CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"]
- CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"]
- dnl Compile with NDEBUG to get rid of assertions
- CFLAGS="$CFLAGS -DNDEBUG"
- CXXFLAGS="$CXXFLAGS -DNDEBUG"
+ AC_MSG_NOTICE([Disabling debugging])
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"]
+ dnl Compile with NDEBUG to get rid of assertions
+ CFLAGS="$CFLAGS -DNDEBUG"
+ CXXFLAGS="$CXXFLAGS -DNDEBUG"
# elif test "$enable_debugging" = "maybe" ; then
# # do nothing
fi
+if test "$enable_optimization" = "yes"; then
+ dnl Add optimization flags, unless they were set by the user
+ if test -z ["`echo $CUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ if test "$enable_debugging" = "yes"; then
+ AC_MSG_NOTICE([Enabling optimizations for C (with debugging enabled)])
+ SVN_CFLAGS_ADD_IFELSE([-O1],[],[
+ SVN_CFLAGS_ADD_IFELSE([-O])])
+ else
+ AC_MSG_NOTICE([Enabling optimizations for C])
+ SVN_CFLAGS_ADD_IFELSE([-O2],[],[
+ SVN_CFLAGS_ADD_IFELSE([-O1],[],[
+ SVN_CFLAGS_ADD_IFELSE([-O])])])
+ fi
+ fi
+ if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ if test "$enable_debugging" = "yes"; then
+ AC_MSG_NOTICE([Enabling optimizations for C++ (with debugging enabled)])
+ SVN_CXXFLAGS_ADD_IFELSE([-O1],[],[
+ SVN_CXXFLAGS_ADD_IFELSE([-O])])
+ else
+ AC_MSG_NOTICE([Enabling optimizations for C++])
+ SVN_CXXFLAGS_ADD_IFELSE([-O2],[],[
+ SVN_CXXFLAGS_ADD_IFELSE([-O1],[],[
+ SVN_CXXFLAGS_ADD_IFELSE([-O])])])
+ fi
+ fi
+elif test "$enable_optimization" = "no"; then
+ dnl Remove all optimization flags
+ AC_MSG_NOTICE([Disabling optimizations])
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+# elif test "$enable_optimization" = "maybe" ; then
+# # do nothing
+fi
+
+
AC_ARG_ENABLE(full-version-match,
AS_HELP_STRING([--disable-full-version-match],
[Disable the full version match rules when checking
@@ -1132,6 +1196,30 @@ AC_SUBST(MOD_ACTIVATION)
+AC_ARG_ENABLE(gcov,
+AC_HELP_STRING([--enable-gcov],
+ [Turn on gcov coverage testing (GCC only).]),
+[
+ if test "$enableval" = "yes" ; then
+ dnl Probably other compilers support something similar;
+ dnl feel free to extend this to include them.
+ if test "$GCC" = "yes"; then
+ if test "$svn_enable_shared" = "yes" ; then
+ AC_MSG_ERROR([Can't have --enable-gcov without --disable-shared (we
+ recommend also using --enable-all-static).])
+ fi
+ if test ! "$enable_all_static" = "yes" ; then
+ AC_MSG_WARN(We recommend --enable-all-static with --enable-gcov.)
+ fi
+ AC_MSG_NOTICE([Enabling gcov coverage testing.])
+ CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+ CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+ else
+ AC_MSG_ERROR([We only support --enable-gcov with GCC right now.])
+ fi
+ fi
+])
+
AC_ARG_ENABLE(gprof,
AS_HELP_STRING([--enable-gprof],
[Produce gprof profiling data in 'gmon.out' (GCC only).]),
@@ -1378,12 +1466,7 @@ AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
### I think we get this flag from APR, so the fix probably belongs there
if test "$CC" = "clang"; then
- CPPFLAGS=`echo "$CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'`
-fi
-
-# Clang also doesn't (yet) support the '-ansi' flag
-if test "$CC" = "clang"; then
- CFLAGS=`echo "$CFLAGS" | $SED -e 's/-ansi //'`
+ SVN_STRIP_FLAG(CPPFLAGS, [-no-cpp-precomp ])
fi
dnl Since this is used only on Unix-y systems, define the path separator as '/'
Modified: subversion/branches/fsfs-format7/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/contrib/client-side/emacs/dsvn.el?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/fsfs-format7/contrib/client-side/emacs/dsvn.el Mon Feb 4 20:48:05 2013
@@ -165,7 +165,7 @@ arguments ARGS. Return the process objec
(lambda ()
(apply svn-process-file svn-program infile buffer display args))))
-(defun svn-call-process (buffer &rest args)
+(defun svn-call-process (buffer args)
"Run svn and wait for it to finish.
Argument BUFFER is the buffer in which to insert output.
Optional argument ARGS are the arguments to svn."
@@ -614,8 +614,8 @@ VERBOSE-P."
(erase-buffer)
(setq default-directory dir)
(svn-call-process diff-buf
- "diff" "-x" "-p" "-r"
- (format "%d:%d" (1- commit-id) commit-id)))))
+ (append (list "diff" "-r" (format "%d:%d" (1- commit-id) commit-id))
+ svn-diff-args)))))
(defun svn-log-edit-files (commit-id)
(let ((root (svn-repository-root))
@@ -1864,8 +1864,8 @@ argument."
(interactive)
(let ((files (svn-action-files
(lambda (pos)
- (or (= (svn-file-status pos) ?C)
- (= (svn-prop-status pos) ?C)
+ (or (memq (svn-file-status pos) '(?C ?!))
+ (memq (svn-prop-status pos) '(?C ?!))
(error "%s has no conflicts"
(svn-getprop pos 'file)))))))
(make-local-variable 'svn-resolved-files)
Modified: subversion/branches/fsfs-format7/contrib/server-side/fsfsfixer/fixer/find_good_id.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/contrib/server-side/fsfsfixer/fixer/find_good_id.py?rev=1442344&r1=1442343&r2=1442344&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/contrib/server-side/fsfsfixer/fixer/find_good_id.py (original)
+++ subversion/branches/fsfs-format7/contrib/server-side/fsfsfixer/fixer/find_good_id.py Mon Feb 4 20:48:05 2013
@@ -1,5 +1,12 @@
#!/usr/bin/env python
+# PER-REPOSITORY CONFIGURATION
+#
+# The number of revs per shard of the repository being accessed, or None if
+# it is not sharded.
+# TODO: Read this from the db/format file.
+REVS_PER_SHARD=None
+
usage = """
Print the correct FSFS node-rev id, given one that is correct except for
its byte-offset part.
@@ -28,8 +35,15 @@ def parse_id(id):
return noderev, rev, offset
def rev_file_path(repo_dir, rev):
- # TODO: support shards
- return os.path.join(repo_dir, 'db', 'revs', rev)
+ """Return the path to the revision file in the repository at REPO_DIR
+ (a path string) for revision number REV (int or string).
+ """
+ if REVS_PER_SHARD:
+ shard = int(rev) / REVS_PER_SHARD
+ path = os.path.join(repo_dir, 'db', 'revs', str(shard), str(rev))
+ else:
+ path = os.path.join(repo_dir, 'db', 'revs', str(rev))
+ return path
def rev_file_indexes(repo_dir, rev):
"""Return (ids, texts), where IDS is a dictionary of all node-rev ids